From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 26 Oct 2009 16:38:56 +0000 (+0100)
Subject: Merge commit 'mhy/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4eb2eff3c463697fd411f29443e1bd669e710bb5;hp=d7cf3f48fb869bff3ce1f80feb6b9541be7fe288;p=dak.git

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  the database is faster than us now

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 80ba45bd..06597f85 100755
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -241,7 +241,7 @@ def main():
     for keyid in desuid_byid.keys():
         uid = (keyid, desuid_byid[keyid][0])
         name = desuid_byid[keyid][1]
-        oname = db_uid_byid[keyid][1]
+        oname = db_uid_byname[keyid][1]
         if name and oname != name:
             changes.append((uid[1], "Full name: %s" % (name)))
             session.execute("UPDATE uid SET name = :name WHERE id = :keyid",