X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_keyring.py;h=cedd60c2084424d28f11ebbaf50d07df47c57f20;hb=b7de904550c68cde24d7a7bff2b883ab6e3ee9cb;hp=e26eb7e54d390d46641a506fba310427262267ee;hpb=3b50b545815298b77b8eb68930acb6fde01ea4d4;p=dak.git

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index e26eb7e5..cedd60c2 100755
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -198,14 +198,9 @@ def main():
                 session.flush()
 
         else:
-            if newuid and olduid != newuid:
-                if olduid != -1:
-                    changes.append((newuiduid, "Linked key: %s" % f))
-                    changes.append((newuiduid, "  (formerly belonging to %s)" % (db_uid_byid[olduid][0])))
-                else:
-                    changes.append((newuiduid, "Linked key: %s" % f))
-                    changes.append((newuiduid, "  (formerly unowned)"))
-
+            if newuid and olduid != newuid and olduid == -1:
+                changes.append((newuiduid, "Linked key: %s" % f))
+                changes.append((newuiduid, "  (formerly unowned)"))
                 session.execute("UPDATE fingerprint SET uid = :uid WHERE id = :fpr",
                                 {'uid': newuid, 'fpr': oldfid})