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()
__all__.append('Keyring')
+def get_or_set_keyring(keyring, session=None):
+ """
+ If C{keyring} does not have an entry in the C{keyrings} table yet, create one
+ and return the new Keyring
+ If C{keyring} already has an entry, simply return the existing Keyring
+
+ @type keyring: string
+ @param keyring: the keyring name
+
+ @rtype: Keyring
+ @return: the Keyring object for this keyring
+
+ """
+ privatetrans = False
+ if session is None:
+ session = DBConn().session()
+ privatetrans = True
+
+ try:
+ obj = session.query(Keyring).filter_by(keyring_name=keyring).first()
+
+ if obj is None:
+ obj = Keyring(keyring_name=keyring)
+ session.add(obj)
+ if privatetrans:
+ session.commit()
+ else:
+ session.flush()
+
+ return obj
+ finally:
+ if privatetrans:
+ session.close()
+
+__all__.append('get_or_set_keyring')
+
################################################################################
class Location(object):