summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch')
-rw-r--r--x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
new file mode 100644
index 000000000000..07c2003f50d8
--- /dev/null
+++ b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
@@ -0,0 +1,23 @@
+--- a/mugshot/MugshotWindow.py 2018-08-08 11:22:42.000000000 +0200
++++ b/mugshot/MugshotWindow.py 2018-08-15 22:47:02.108700297 +0200
+@@ -617,14 +617,18 @@
+ # 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"
++ # other (newer, older?) use "-o" or "-w"
++ o_command = "%s -o \"%s\" %s" % (chfn, office_phone, username)
+ 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
++ if self.process_terminal_password(command2, password):
++ self.office_phone = office_phone
++ else:
++ success = False
+
+ return (success, response)
+