[dak/master] Make import_keyring use get_or_set_keyring.
Signed-off-by: Chris Lamb <lamby@debian.org>
---
dak/import_keyring.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 4c6a2ea..2136709 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()
--
1.5.6.5
Reply to: