From: Chris Lamb Date: Mon, 26 Oct 2009 14:48:15 +0000 (+0000) Subject: Make import_keyring use dbconn.get_or_set_uid. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa47bd280bedc83cb1c7d55f80478d813c160931;p=dak Make import_keyring use dbconn.get_or_set_uid. Signed-off-by: Chris Lamb --- diff --git a/dak/import_keyring.py b/dak/import_keyring.py index 21367098..eac8ae5d 100755 --- 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_id(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_id(uid).uid byuid[keyid] = (uid, "ungeneratable user id") byname[uid] = (keyid, "ungeneratable user id") return (byname, byuid)