From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 26 Oct 2009 15:03:55 +0000 (+0100)
Subject: Merge commit 'mhy/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=84e2afd2b02875e9d28f83426ac8c1dbaf90b120;hp=efa1b13e55848306d5e3b1f27d6c56a708d58f70;p=dak.git

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  hack around file hanging around forever

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 4c6a2eaa..80ba45bd 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(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()
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 23aeda6f..c0b7d0e8 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -981,6 +981,42 @@ class Keyring(object):
 
 __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):