diff options
| author |   Conrad Kostecki <conrad@kostecki.com> | 2018-08-15 23:22:02 +0200 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2018-08-20 00:50:42 +0200 |
| commit | db5e58ad876f2afe19396695c184a133312a7146 (patch) | |
| tree | f1ee0eeb6ee67fd4b981109dfc84295cf96af2f0 /x11-misc/mugshot/files | |
| parent | dev-libs/spdlog: verbump to 1.1.0. (diff) | |
| download | gentoo-db5e58ad876f2afe19396695c184a133312a7146.tar.gz gentoo-db5e58ad876f2afe19396695c184a133312a7146.tar.bz2 gentoo-db5e58ad876f2afe19396695c184a133312a7146.zip | |
x11-misc/mugshot: version bump to 0.4.1.
Closes: https://bugs.gentoo.org/663740
Package-Manager: Portage-2.3.45, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9586
Diffstat (limited to 'x11-misc/mugshot/files')
| -rw-r--r-- | x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch | 18 | ||||
| -rw-r--r-- | x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch | 23 |
2 files changed, 41 insertions, 0 deletions
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch new file mode 100644 index 000000000000..cc504d667af9 --- /dev/null +++ b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch @@ -0,0 +1,18 @@ +--- a/mugshot/MugshotWindow.py 2018-08-08 11:22:42.000000000 +0200 ++++ b/mugshot/MugshotWindow.py 2018-08-15 22:48:39.998699923 +0200 +@@ -256,10 +256,11 @@ + + if os.path.isfile(face): + try: +- if os.path.samefile(image, face): +- self.updated_image = face +- else: +- self.updated_image = None ++ if os.path.exists(image): ++ if os.path.samefile(image, face): ++ self.updated_image = face ++ else: ++ self.updated_image = None + except FileNotFoundError: + self.updated_image = None + self.set_user_image(face) 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) + |