[Python-modules-commits] r24844 - in packages/python-keyring/trunk/debian (3 files)

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

    Date: Tuesday, June 18, 2013 @ 16:07:42
  Author: mitya57-guest
Revision: 24844

debian/patches/catch-dbus-errors.patch: catch D-Bus errors when checking
if SecretService is supported (can be dropped when the next SecretStorage
version is released, where this is fixed).

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

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2013-06-18 14:22:05 UTC (rev 24843)
+++ packages/python-keyring/trunk/debian/changelog	2013-06-18 16:07:42 UTC (rev 24844)
@@ -19,6 +19,9 @@
     it is not in Debian.
   * debian/patches/fix-importkiller.patch: fix ImportKiller not working
     with Python 3.x (fixes the testsuite).
+  * debian/patches/catch-dbus-errors.patch: catch D-Bus errors when checking
+    if SecretService is supported (can be dropped when the next SecretStorage
+    version is released, where this is fixed).
   * Bump Standards-Version to 3.9.4 and debhelper compat level to 9.
   * Disable HTTP traffic in debian/rules.
   * Run upstream testsuite during build; simplify other debian/rules parts.

Added: packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch
===================================================================
--- packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	                        (rev 0)
+++ packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	2013-06-18 16:07:42 UTC (rev 24844)
@@ -0,0 +1,20 @@
+Description: catch D-Bus errors when checking if SecretService is supported
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: no
+Last-Update: 2013-06-18
+
+--- a/keyring/backends/SecretService.py
++++ b/keyring/backends/SecretService.py
+@@ -14,10 +14,11 @@
+         except ImportError:
+             return -1
+         from secretstorage.exceptions import SecretServiceNotAvailableException
++        from dbus.exceptions import DBusException
+         try:
+             bus = secretstorage.dbus_init()
+             secretstorage.Collection(bus)
+-        except (ImportError, SecretServiceNotAvailableException):
++        except (ImportError, SecretServiceNotAvailableException, DBusException):
+             return -1
+         else:
+             return 1

Modified: packages/python-keyring/trunk/debian/patches/series
===================================================================
--- packages/python-keyring/trunk/debian/patches/series	2013-06-18 14:22:05 UTC (rev 24843)
+++ packages/python-keyring/trunk/debian/patches/series	2013-06-18 16:07:42 UTC (rev 24844)
@@ -1,2 +1,3 @@
 no-pytest-runner.patch
 fix-importkiller.patch
+catch-dbus-errors.patch