Merge commit 'ftpmaster/master'

[dak.git] / dak / import_keyring.py

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index eac8ae5d406a6b89f1d9751698633287ba6fe019..0b670357f2999c9d8d1a066e1290eaa24eda1f42 100755 (executable)
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -24,7 +24,6 @@ import apt_pkg, ldap, email.Utils
 
 from daklib.config import Config
 from daklib.dbconn import *
-from daklib import utils
 
 
 # Globals
@@ -140,7 +139,7 @@ class Keyring(object):
                 keys[key]["uid"] = uid
 
                 if keyid != None: continue
-                keyid = get_or_set_uid_id(uid).uid
+                keyid = get_or_set_uid(uid).uid
                 byuid[keyid] = (uid, name)
                 byname[uid] = (keyid, name)
 
@@ -163,7 +162,7 @@ class Keyring(object):
                 keys[x]["uid"] = uid
         if any_invalid:
             uid = format % "invalid-uid"
-            keyid = get_or_set_uid_id(uid).uid
+            keyid = get_or_set_uid(uid).uid
             byuid[keyid] = (uid, "ungeneratable user id")
             byname[uid] = (keyid, "ungeneratable user id")
         return (byname, byuid)
@@ -241,7 +240,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",