[Python-modules-commits] r25704 - in packages/python-keyring/trunk/debian/patches (1 file)

[mitya57-guest at users.alioth.debian.org]

    Date: Saturday, August 31, 2013 @ 10:00:21
  Author: mitya57-guest
Revision: 25704

Really refresh catch-dbus-errors.patch

Modified:
  packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch

Modified: packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch
===================================================================
--- packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	2013-08-31 09:36:49 UTC (rev 25703)
+++ packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	2013-08-31 10:00:21 UTC (rev 25704)
@@ -5,12 +5,15 @@
 
 --- a/keyring/backends/SecretService.py
 +++ b/keyring/backends/SecretService.py
-@@ -26,7 +26,8 @@
+@@ -23,10 +23,11 @@
+             secretstorage.__name__
+         if exc:
+             raise RuntimeError("SecretService required")
++        from dbus.exceptions import DBusException
          try:
              bus = secretstorage.dbus_init()
              secretstorage.Collection(bus)
 -        except secretstorage.exceptions.SecretServiceNotAvailableException:
-+        from dbus.exceptions import DBusException
 +        except (secretstorage.exceptions.SecretServiceNotAvailableException, DBusException):
              raise RuntimeError("Unable to get initialize SecretService")
          if 'DISPLAY' not in os.environ: