diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2010-06-15 17:29:16 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2010-06-15 17:29:16 +0000 |
| commit | 21264d478ee263b1c48d885834b33686abd4ef36 (patch) | |
| tree | 563bb4ee3f225945d779f4a677259af99d8c6c4b /app-emulation/virt-manager/files | |
| parent | Version bump and remove old testing (diff) | |
| download | gentoo-2-21264d478ee263b1c48d885834b33686abd4ef36.tar.gz gentoo-2-21264d478ee263b1c48d885834b33686abd4ef36.tar.bz2 gentoo-2-21264d478ee263b1c48d885834b33686abd4ef36.zip | |
Fix issue with default keyring usage. Fixes upstream: https://bugzilla.redhat.com/show_bug.cgi?id=603954 and bug #324027
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/virt-manager/files')
| -rw-r--r-- | app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch b/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch new file mode 100644 index 000000000000..2e836d7caef6 --- /dev/null +++ b/app-emulation/virt-manager/files/virt-manager-0.8.4-default-keyring.patch @@ -0,0 +1,33 @@ +diff -Nur virt-manager-0.8.4/AUTHORS virt-manager-0.8.4-default-keyring//AUTHORS +--- virt-manager-0.8.4/AUTHORS 2010-03-23 13:25:27.000000000 -0500 ++++ virt-manager-0.8.4-default-keyring//AUTHORS 2010-06-15 12:19:29.000000000 -0500 +@@ -63,6 +63,7 @@ + Fred Leeflang <fredl-at-dutchie-dot-org> + Jon Nordby <jononor-at-gmail-dot-com> + Ales Zelinka <azelinka-at-redhat.com> ++ Matthias Fulz <olz1983-at-googlemail-dot-com> + + <...send a patch & get your name here...> + +diff -Nur virt-manager-0.8.4/src/virtManager/keyring.py virt-manager-0.8.4-default-keyring//src/virtManager/keyring.py +--- virt-manager-0.8.4/src/virtManager/keyring.py 2010-03-23 13:25:29.000000000 -0500 ++++ virt-manager-0.8.4-default-keyring//src/virtManager/keyring.py 2010-06-15 12:21:53.000000000 -0500 +@@ -35,11 +35,15 @@ + def __init__(self): + if haveKeyring: + try: +- if not("default" in gnomekeyring.list_keyring_names_sync()): +- gnomekeyring.create_sync("default", None) + self.keyring = gnomekeyring.get_default_keyring_sync() + if self.keyring == None: +- logging.warning("Failed to create default keyring") ++ # Code borrowed from ++ # http://trac.gajim.org/browser/src/common/passwords.py ++ self.keyring = 'default' ++ try: ++ gnomekeyring.create_sync(self.keyring, None) ++ except gnomekeyring.AlreadyExistsError: ++ pass + except: + logging.warning(("Keyring unavailable: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1]))) + self.keyring = None |