From 37671fddb5bdb73c0ebde74c98481b226f496704 Mon Sep 17 00:00:00 2001
From: Sean Davis <smd.seandavis@gmail.com>
Date: Mon, 6 Aug 2018 06:11:37 -0400
Subject: [PATCH] Handle both versions of chfn office phone parameters (LP:
 #1699285)

---
 mugshot/MugshotWindow.py | 11 +++++++++--
 po/mugshot.pot           |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mugshot/MugshotWindow.py b/mugshot/MugshotWindow.py
index 815a964..3099056 100644
--- a/mugshot/MugshotWindow.py
+++ b/mugshot/MugshotWindow.py
@@ -612,8 +612,15 @@ class MugshotWindow(Window):
             success = False
 
         logger.debug('Updating Office Phone...')
-        command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
-        if self.process_terminal_password(command, password):
+
+        # chfn 2.29 uses "-p" as parameter for changing the office-phone (LP: #1699285)
+        p_command = "%s -p \"%s\" %s" % (chfn, office_phone, username)
+
+        # other (newer, older?) use "-w"
+        w_command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
+
+        if self.process_terminal_password(p_command, password) or \
+            self.process_terminal_password(w_command, password):
             self.office_phone = office_phone
         else:
             success = False
diff --git a/po/mugshot.pot b/po/mugshot.pot
index ff85514..e4a51b0 100644
--- a/po/mugshot.pot
+++ b/po/mugshot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-06 06:00-0400\n"
+"POT-Creation-Date: 2018-08-06 06:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -141,11 +141,11 @@ msgid ""
 "to your personal information."
 msgstr ""
 
-#: ../mugshot/MugshotWindow.py:822
+#: ../mugshot/MugshotWindow.py:829
 msgid "Update LibreOffice user details?"
 msgstr ""
 
-#: ../mugshot/MugshotWindow.py:823
+#: ../mugshot/MugshotWindow.py:830
 msgid "Would you also like to update your user details in LibreOffice?"
 msgstr ""