Modified dm status to be a keyring specific switch, modified update1

[dak.git] / dak / import_keyring.py

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 6d91b46079d6f832328e73891b84dbd5cf75296a..8daf4e5cb0d80749502e53c1912139e717acf89b 100755 (executable)
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -19,8 +19,8 @@
 
 ################################################################################
 
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 import sys, os, re
 import apt_pkg, pg, ldap, email.Utils
 
@@ -222,6 +222,9 @@ def main():
     keyringname = keyring_names[0]
     keyring = Keyring(keyringname)
 
+    if Cnf.has_key("Import-Keyring::"+keyringname+"::Debian-Maintainer"):
+        projectB.query("UPDATE keyrings SET debian_maintainer = '%s' WHERE name = '%s'" % (Cnf["Import-Keyring::"+keyringname+"::Debian-Maintainer"], keyringname.split("/")[-1]))
+
     keyring_id = database.get_or_set_keyring_id(
                         keyringname.split("/")[-1])