From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 26 Oct 2009 15:24:51 +0000 (+0100)
Subject: Merge commit 'lamby/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=939a4e0c22f2e1070e460551b2adc0f686d79183;hp=e4fd019394c15b807aa88510e01496b5a2c03e50;p=dak.git

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Use the correct dictionary to lookup name of users.

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",