From: Chris Lamb <lamby@debian.org>
Date: Mon, 26 Oct 2009 14:46:13 +0000 (+0000)
Subject: Make import_keyring use get_or_set_keyring.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c4ee430fd21272da3c379a0d5d75754135f6cc83;p=dak.git

Make import_keyring use get_or_set_keyring.

Signed-off-by: Chris Lamb <lamby@debian.org>
---

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 4c6a2eaa..21367098 100755
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -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()