]> git.decadent.org.uk Git - dak.git/commitdiff
Find/replace fail.
authorChris Lamb <lamby@debian.org>
Mon, 26 Oct 2009 14:52:42 +0000 (14:52 +0000)
committerChris Lamb <lamby@debian.org>
Mon, 26 Oct 2009 14:52:51 +0000 (14:52 +0000)
Signed-off-by: Chris Lamb <lamby@debian.org>
dak/import_keyring.py

index eac8ae5d406a6b89f1d9751698633287ba6fe019..80ba45bd89a9f3d63184b595c6ea9e3244dce620 100755 (executable)
@@ -140,7 +140,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 +163,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)