from daklib.config import Config
from daklib.dbconn import *
-from daklib import utils
# Globals
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)
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)
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()
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",