[Python-apps-commits] r10631 - in packages/pyspread/trunk/debian (3 files)

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

    Date: Monday, March 3, 2014 @ 16:01:15
  Author: anoteng-guest
Revision: 10631

fix #739907

Added:
  packages/pyspread/trunk/debian/patches/gpg_uid_to_key_id.patch
Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/patches/series

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2014-03-03 08:46:03 UTC (rev 10630)
+++ packages/pyspread/trunk/debian/changelog	2014-03-03 16:01:15 UTC (rev 10631)
@@ -9,9 +9,11 @@
   * Add suggests: ttf-mscorefonts-installer
   * Make sure tests don't fail if ttf-mscorefonts-installer is not installed
     (tests_font_check.patch)
+  * Switch from using key uid to key id (Closes: #739907)
+    (gpg_uid_to_key_id.patch)
   * Standards-Version bumped to 3.9.5 (no change)
 
- -- Andreas Noteng <andreas at noteng.no>  Sun, 23 Feb 2014 20:43:51 +0100
+ -- Andreas Noteng <andreas at noteng.no>  Mon, 03 Mar 2014 17:00:24 +0100
 
 pyspread (0.2.3-2) unstable; urgency=low
 

Added: packages/pyspread/trunk/debian/patches/gpg_uid_to_key_id.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/gpg_uid_to_key_id.patch	                        (rev 0)
+++ packages/pyspread/trunk/debian/patches/gpg_uid_to_key_id.patch	2014-03-03 16:01:15 UTC (rev 10631)
@@ -0,0 +1,113 @@
+From: Martin Manns <mmanns at gmx.net>
+Last-Update: Thu, 27 Feb 2014 20:59:00 +0100
+Subject: gpg now uses key ids instead of uids to cope with Debian bug
+Origin: https://github.com/manns/pyspread/commit/0c18d269283ac5be4dd6079ddaaada119dae20df
+Bug-Debian: http://bugs.debian.org/739907
+
+--- a/pyspread/src/config.py
++++ b/pyspread/src/config.py
+@@ -104,7 +104,8 @@
+         # GPG parameters
+         # --------------
+ 
+-        self.gpg_key_uid = repr('')
++        #self.gpg_key_uid = repr('')  # Deprecated
++        self.gpg_key_fingerprint = repr('')
+ 
+         # CSV parameters for import and export
+         # ------------------------------------
+@@ -181,12 +182,13 @@
+                 setattr(self.data, key, getattr(DefaultConfig(), key))
+             self.data.config_version = self.version
+ 
+-        # Reset GPG key if version prior 0.2.4
+-        # because of pyme -> gnupg migration
++        # Delete gpg_key_uid and insert fingerprint key
+ 
+-        if old_config:
+-            key = "gpg_key_uid"
+-            setattr(self.data, key, getattr(DefaultConfig(), key))
++        if hasattr(self.data, "gpg_key_uid"):
++            oldkey = "gpg_key_uid"
++            delattr(self.data, oldkey)
++            newkey = "gpg_key_fingerprint"
++            setattr(self.data, newkey, getattr(DefaultConfig(), newkey))
+ 
+     def save(self):
+         """Saves configuration file"""
+--- a/pyspread/src/gui/_dialogs.py
++++ b/pyspread/src/gui/_dialogs.py
+@@ -1277,9 +1277,9 @@
+             "widget_params": {"min": 0, "allow_long": True},
+             "prepocessor": int,
+         }),
+-        ("gpg_key_uid", {
+-            "label": _(u"GPG key name"),
+-            "tooltip": _(u"Name of the GPG key for signing files"),
++        ("gpg_key_fingerprint", {
++            "label": _(u"GPG key id"),
++            "tooltip": _(u"Fingerprint of the GPG key for signing files"),
+             "widget": wx.TextCtrl,
+             "widget_params": {},
+             "prepocessor": unicode,
+--- a/pyspread/src/lib/gpg.py
++++ b/pyspread/src/lib/gpg.py
+@@ -94,22 +94,26 @@
+ 
+     # Check if standard key is already present
+ 
+-    pyspread_key_uid = str(config["gpg_key_uid"])
+-    gpg_private_keylist = gpg.list_keys(True)
++    pyspread_key_fingerprint = str(config["gpg_key_fingerprint"])
++    gpg_private_keys = gpg.list_keys(True)
++    gpg_private_fingerprints = gpg.list_keys(True).fingerprints
+ 
+     pyspread_key = None
+ 
+-    for private_key in gpg_private_keylist:
+-        if pyspread_key_uid in private_key["uids"]:
++    for private_key, fingerprint in zip(gpg_private_keys,
++                                        gpg_private_fingerprints):
++        if pyspread_key_fingerprint == fingerprint:
+             pyspread_key = private_key
+ 
+     if pyspread_key is None:
+         # If no GPG key is set in config, choose one
+-        pyspread_key_uid, pyspread_key = choose_uid_key(gpg_private_keylist)
++        pyspread_key_uid, pyspread_key = choose_uid_key(gpg_private_keys)
+ 
+     if pyspread_key:
+         # A key has been chosen
+-        config["gpg_key_uid"] = repr(pyspread_key_uid)
++        fingerprint = \
++            gpg_private_fingerprints[gpg_private_keys.index(pyspread_key)]
++        config["gpg_key_fingerprint"] = repr(fingerprint)
+ 
+     else:
+         # No key has been chosen --> Create new one
+@@ -138,7 +142,8 @@
+ 
+             for private_key in gpg.list_keys(True):
+                 if str(fingerprint) == private_key['fingerprint']:
+-                    config["gpg_key_uid"] = repr(private_key['uids'][0])
++                    config["gpg_key_fingerprint"] = repr(
++                        private_key.fingerprint)
+ 
+         else:
+             dlg.Destroy()
+@@ -152,7 +157,7 @@
+ 
+     signfile = open(filename, "rb")
+ 
+-    signed_data = gpg.sign_file(signfile, keyid=config["gpg_key_uid"],
++    signed_data = gpg.sign_file(signfile, keyid=config["gpg_key_fingerprint"],
+                                 detach=True)
+     signfile.close()
+ 
+@@ -170,4 +175,4 @@
+ 
+     sigfile.close()
+ 
+-    return verified
+\ No newline at end of file
++    return verified

Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series	2014-03-03 08:46:03 UTC (rev 10630)
+++ packages/pyspread/trunk/debian/patches/series	2014-03-03 16:01:15 UTC (rev 10631)
@@ -2,3 +2,4 @@
 change_default_paths.patch
 python_tutorial.patch
 tests_font_check.patch
+gpg_uid_to_key_id.patch