[dak/master] do no longer automatically update UIDs

[Torsten Werner <twerner@debian.org>]

- ... because we want to have control over the UIDs.

Signed-off-by: Torsten Werner <twerner@debian.org>
---
 dak/import_keyring.py |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index e26eb7e..cedd60c 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})
 
-- 
1.5.6.5