diff options
author | David P <megver83@openmailbox.org> | 2017-03-27 10:07:22 -0300 |
---|---|---|
committer | David P <megver83@openmailbox.org> | 2017-03-27 10:07:22 -0300 |
commit | a284aeb36f9b07c11b3fbdfaa70cf654a98d2cb9 (patch) | |
tree | e0652b20ae0ceed62d0a56f4e69027a946ba0763 /pcr/mugshot/office-phone.patch | |
parent | 3ca4240e209da61acc31f5c4467b0bba283a5c6b (diff) | |
download | abslibre-a284aeb36f9b07c11b3fbdfaa70cf654a98d2cb9.tar.gz abslibre-a284aeb36f9b07c11b3fbdfaa70cf654a98d2cb9.tar.bz2 abslibre-a284aeb36f9b07c11b3fbdfaa70cf654a98d2cb9.zip |
Added mugshot
Diffstat (limited to 'pcr/mugshot/office-phone.patch')
-rw-r--r-- | pcr/mugshot/office-phone.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/pcr/mugshot/office-phone.patch b/pcr/mugshot/office-phone.patch new file mode 100644 index 000000000..dbca2c59d --- /dev/null +++ b/pcr/mugshot/office-phone.patch @@ -0,0 +1,35 @@ +From 8f639e7a29b3bfebbbbd8f520c05637377560bb3 Mon Sep 17 00:00:00 2001 +From: Mike Keen <mkeen.atl@gmail.com> +Date: Thu, 5 Nov 2015 11:47:30 -0500 +Subject: [PATCH] Support the -o flag if the -w flag fails + +--- +mugshot/MugshotWindow.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/mugshot/MugshotWindow.py b/mugshot/MugshotWindow.py +index 35323be..b557edf 100644 +--- a/mugshot/MugshotWindow.py ++++ b/mugshot/MugshotWindow.py +@@ -632,11 +632,18 @@ class MugshotWindow(Window): + success = False + + logger.debug('Updating Office Phone...') ++ + command = "%s -w \"%s\" %s" % (chfn, office_phone, username) ++ # Office phone is potentially handled by the -o flag in newer versions of chfn ++ command2 = "%s -o \"%s\" %s" % (chfn, office_phone, username) + if self.process_terminal_password(command, password): + self.office_phone = office_phone + else: +- success = False ++ # Retry with command2 ++ if self.process_terminal_password(command2, password): ++ self.office_phone = office_phone ++ else: ++ success = False + + return (success, response) + +-- +2.6.2 |