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

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

    Date: Friday, November 1, 2013 @ 14:22:30
  Author: mitya57-guest
Revision: 26345

Refresh catch-dbus-errors.patch.

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

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2013-11-01 13:19:37 UTC (rev 26344)
+++ packages/python-keyring/trunk/debian/changelog	2013-11-01 14:22:30 UTC (rev 26345)
@@ -4,6 +4,7 @@
   * New upstream release.
   * Bump X-Python-Version to >= 2.6 (2.5 is no longer supported).
   * Unify running the tests across Python 2 and Python 3.
+  * Refresh catch-dbus-errors.patch.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 23 Oct 2013 18:18:06 +0400
 

Modified: packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch
===================================================================
--- packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	2013-11-01 13:19:37 UTC (rev 26344)
+++ packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	2013-11-01 14:22:30 UTC (rev 26345)
@@ -5,7 +5,7 @@
 
 --- a/keyring/backends/SecretService.py
 +++ b/keyring/backends/SecretService.py
-@@ -23,10 +23,11 @@
+@@ -22,10 +22,11 @@
              secretstorage.__name__
          if exc:
              raise RuntimeError("SecretService required")
@@ -16,5 +16,5 @@
 -        except secretstorage.exceptions.SecretServiceNotAvailableException:
 +        except (secretstorage.exceptions.SecretServiceNotAvailableException, DBusException):
              raise RuntimeError("Unable to get initialize SecretService")
-         if 'DISPLAY' not in os.environ:
-             raise RuntimeError("SecretService cannot run without a DISPLAY "
+         return 5
+