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

[sramacher at users.alioth.debian.org]

    Date: Sunday, January 6, 2013 @ 19:52:33
  Author: sramacher
Revision: 23264

* Team upload.
* Acknowledge Salvatore Bonaccorso's NMU.
* New upstream release.
  - Fix migration code so old databases get upgraded when a key is read.
* debian/patches:
  - CryptedFileKeyring-fix-unlock-logic.patch: patch from
    upstream to fix the unlock logic in CryptedFileKeyring. (Closes:
    #697213) (LP: #1042754)

Added:
  packages/python-keyring/trunk/debian/patches/CryptedFileKeyring-fix-unlock-logic.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-01-06 19:04:31 UTC (rev 23263)
+++ packages/python-keyring/trunk/debian/changelog	2013-01-06 19:52:33 UTC (rev 23264)
@@ -1,3 +1,16 @@
+python-keyring (0.9.3-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Acknowledge Salvatore Bonaccorso's NMU.
+  * New upstream release.
+    - Fix migration code so old databases get upgraded when a key is read.
+  * debian/patches:
+    - CryptedFileKeyring-fix-unlock-logic.patch: patch from
+      upstream to fix the unlock logic in CryptedFileKeyring. (Closes:
+      #697213) (LP: #1042754)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Sun, 06 Jan 2013 20:34:01 +0100
+
 python-keyring (0.9.2-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

Added: packages/python-keyring/trunk/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch
===================================================================
--- packages/python-keyring/trunk/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch	                        (rev 0)
+++ packages/python-keyring/trunk/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch	2013-01-06 19:52:33 UTC (rev 23264)
@@ -0,0 +1,21 @@
+Description: fix unlock logic in CryptedFileKeyring
+Origin: upstream,
+ https://bitbucket.org/kang/python-keyring-lib/commits/28ed1e5f
+Bug-Debian: http://bugs.debian.org/697213
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-keyring/+bug/1042754
+Last-Update: 2013-01-06
+
+--- a/keyring/backend.py
++++ b/keyring/backend.py
+@@ -463,7 +463,10 @@
+     @properties.NonDataProperty
+     def keyring_key(self):
+         # _unlock or _init_file will set the key or raise an exception
+-        self._check_file() and self._unlock() or self._init_file()
++        if self._check_file():
++            self._unlock()
++        else:
++            self._init_file()
+         return self.keyring_key
+ 
+     def _get_new_password(self):

Modified: packages/python-keyring/trunk/debian/patches/series
===================================================================
--- packages/python-keyring/trunk/debian/patches/series	2013-01-06 19:04:31 UTC (rev 23263)
+++ packages/python-keyring/trunk/debian/patches/series	2013-01-06 19:52:33 UTC (rev 23264)
@@ -1 +1,2 @@
 696736-Fix-insecure-permissions-on-database-files.patch
+CryptedFileKeyring-fix-unlock-logic.patch