Fix utils.build_file_list() for 3.x source packages

[dak.git] / dak / import_keyring.py

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 4c6a2eaa73dcbfad787cdb87e4bbe0d74a19c917..06597f85176c6077db21ad5200b48bb3ccb8134a 100755 (executable)
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -140,7 +140,7 @@ class Keyring(object):
                 keys[key]["uid"] = uid
 
                 if keyid != None: continue
-                keyid = database.get_or_set_uid_id(uid)
+                keyid = get_or_set_uid(uid).uid
                 byuid[keyid] = (uid, name)
                 byname[uid] = (keyid, name)
 
@@ -157,13 +157,13 @@ class Keyring(object):
                 keys[x]["uid"] = format % "invalid-uid"
             else:
                 uid = format % keys[x]["email"]
-                keyid = database.get_or_set_uid_id(uid)
+                keyid = get_or_set_uid(uid).uid
                 byuid[keyid] = (uid, keys[x]["name"])
                 byname[uid] = (keyid, keys[x]["name"])
                 keys[x]["uid"] = uid
         if any_invalid:
             uid = format % "invalid-uid"
-            keyid = database.get_or_set_uid_id(uid)
+            keyid = get_or_set_uid(uid).uid
             byuid[keyid] = (uid, "ungeneratable user id")
             byname[uid] = (keyid, "ungeneratable user id")
         return (byname, byuid)
@@ -227,8 +227,9 @@ def main():
 
         is_dm = cnf["Import-Keyring::"+keyringname+"::Debian-Maintainer"]
 
-    keyring_id = database.get_or_set_keyring_id(
-                        keyringname.split("/")[-1])
+    keyring_id = get_or_set_keyring(
+        keyringname.split("/")[-1], session,
+    ).keyring_id
 
     ### Generate new uid entries if they're needed (from LDAP or the keyring)
     (desuid_byname, desuid_byid) = keyring.generate_desired_users()
@@ -240,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",