From: Ansgar Burchardt <ansgar@debian.org>
Date: Tue, 10 Sep 2013 21:23:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=36f2e4eed512ab916efac0dc2ecb6dc0d503397b;hp=d74d0da2671139d6f359a8f59c0b5f74808e5f1a;p=dak.git

Merge remote-tracking branch 'origin/master'
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index e5d4049c..22d20a57 100644
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -1199,7 +1199,7 @@ class Keyring(object):
 
         k = os.popen(self.gpg_invocation % keyring, "r")
         key = None
-        signingkey = False
+        need_fingerprint = False
 
         for line in k:
             field = line.split(":")
@@ -1210,18 +1210,16 @@ class Keyring(object):
                 if "@" in addr:
                     self.keys[key]["email"] = addr
                     self.keys[key]["name"] = name
-                self.keys[key]["fingerprints"] = []
-                signingkey = True
-            elif key and field[0] == "sub" and len(field) >= 12:
-                signingkey = ("s" in field[11])
+                need_fingerprint = True
             elif key and field[0] == "uid":
                 (name, addr) = self.parse_address(field[9])
                 if "email" not in self.keys[key] and "@" in addr:
                     self.keys[key]["email"] = addr
                     self.keys[key]["name"] = name
-            elif signingkey and field[0] == "fpr":
-                self.keys[key]["fingerprints"].append(field[9])
+            elif need_fingerprint and field[0] == "fpr":
+                self.keys[key]["fingerprints"] = [field[9]]
                 self.fpr_lookup[field[9]] = key
+                need_fingerprint = False
 
     def import_users_from_ldap(self, session):
         import ldap