From: Torsten Werner Date: Wed, 29 Dec 2010 23:10:05 +0000 (+0100) Subject: do no longer automatically update UIDs X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7de904550c68cde24d7a7bff2b883ab6e3ee9cb;p=dak do no longer automatically update UIDs - ... because we want to have control over the UIDs. Signed-off-by: Torsten Werner --- 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})