diff options
author | Conrad Kostecki <conrad@kostecki.com> | 2018-08-15 23:23:03 +0200 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2018-08-20 00:50:43 +0200 |
commit | ebf109215d0e3c67d49576a8252c2c16c860d353 (patch) | |
tree | 4df62e1b97ca6f34404c199b8c6989123bcb8560 /x11-misc/mugshot/files | |
parent | x11-misc/mugshot: version bump to 0.4.1. (diff) | |
download | gentoo-ebf109215d0e3c67d49576a8252c2c16c860d353.tar.gz gentoo-ebf109215d0e3c67d49576a8252c2c16c860d353.tar.bz2 gentoo-ebf109215d0e3c67d49576a8252c2c16c860d353.zip |
x11-misc/mugshot: drop old version
Bug: https://bugs.gentoo.org/663740
Package-Manager: Portage-2.3.45, Repoman-2.3.10
Diffstat (limited to 'x11-misc/mugshot/files')
-rw-r--r-- | x11-misc/mugshot/files/fix_env_spawn_args.patch | 47 | ||||
-rw-r--r-- | x11-misc/mugshot/files/missing_default_face.patch | 18 | ||||
-rw-r--r-- | x11-misc/mugshot/files/use_office_phone.patch | 18 |
3 files changed, 0 insertions, 83 deletions
diff --git a/x11-misc/mugshot/files/fix_env_spawn_args.patch b/x11-misc/mugshot/files/fix_env_spawn_args.patch deleted file mode 100644 index bb24418a7dbc..000000000000 --- a/x11-misc/mugshot/files/fix_env_spawn_args.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/mugshot_lib/SudoDialog.py 2018-04-12 00:23:21.000000000 +0200 -+++ b/mugshot_lib/SudoDialog.py 2018-06-22 22:21:10.876589365 +0200 -@@ -48,7 +48,7 @@ - return False - - # Check for LANG requirements -- child = env_spawn('sudo -v', 1) -+ child = env_spawn('sudo', ['-v'], 1) - if child.expect([".*ssword.*", "Sorry", - pexpect.EOF, - pexpect.TIMEOUT]) == 3: -@@ -57,7 +57,7 @@ - child.close() - - # Check for sudo rights -- child = env_spawn('sudo -v', 1) -+ child = env_spawn('sudo', ['-v'], 1) - try: - index = child.expect([".*ssword.*", "Sorry", - pexpect.EOF, pexpect.TIMEOUT]) -@@ -76,14 +76,14 @@ - return False - - --def env_spawn(command, timeout): -+def env_spawn(command, args, timeout): - """Use pexpect.spawn, adapt for timeout and env requirements.""" - env = os.environ - env["LANG"] = "C" - if use_env: -- child = pexpect.spawn(command, env) -+ child = pexpect.spawn(command, args, env) - else: -- child = pexpect.spawn(command) -+ child = pexpect.spawn(command, args) - child.timeout = timeout - return child - -@@ -304,7 +304,7 @@ - Return True if successful. - ''' - # Set the pexpect variables and spawn the process. -- child = env_spawn('sudo /bin/true', 1) -+ child = env_spawn('sudo', ['/bin/true'], 1) - try: - # Check for password prompt or program exit. - child.expect([".*ssword.*", pexpect.EOF]) diff --git a/x11-misc/mugshot/files/missing_default_face.patch b/x11-misc/mugshot/files/missing_default_face.patch deleted file mode 100644 index 0d25fb610137..000000000000 --- a/x11-misc/mugshot/files/missing_default_face.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/mugshot/MugshotWindow.py 2018-04-12 00:23:21.000000000 +0200 -+++ b/mugshot/MugshotWindow.py 2018-06-22 22:27:05.515588012 +0200 -@@ -257,10 +257,11 @@ - logger.debug('Found profile image: %s' % str(image)) - - if os.path.isfile(face): -- 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 - self.set_user_image(face) - elif os.path.isfile(image): - self.updated_image = image diff --git a/x11-misc/mugshot/files/use_office_phone.patch b/x11-misc/mugshot/files/use_office_phone.patch deleted file mode 100644 index bea3f7ce4dae..000000000000 --- a/x11-misc/mugshot/files/use_office_phone.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/mugshot/MugshotWindow.py 2018-06-22 22:33:03.980586645 +0200 -+++ b/mugshot/MugshotWindow.py 2018-06-22 22:41:44.120584661 +0200 -@@ -614,10 +614,14 @@ - - logger.debug('Updating Office Phone...') - command = "%s -w \"%s\" %s" % (chfn, office_phone, username) -+ command2 = "%s -o \"%s\" %s" % (chfn, office_phone, username) - if self.process_terminal_password(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) - |