X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_ldap_fingerprints.py;h=0c2a7bd8442dde01d14f78d3f3939b78ba45273d;hb=362ea497d3c9ee5891fca772132269d809a0547a;hp=ec27acbefa215a89e08ce283112732d9708d80de;hpb=0dada7c5846e0ae676bbe0b81c1065fe75ca9b86;p=dak.git

diff --git a/dak/import_ldap_fingerprints.py b/dak/import_ldap_fingerprints.py
index ec27acbe..0c2a7bd8 100755
--- a/dak/import_ldap_fingerprints.py
+++ b/dak/import_ldap_fingerprints.py
@@ -44,7 +44,7 @@
 
 ################################################################################
 
-import commands, ldap, re, sys
+import commands, ldap, sys
 import apt_pkg
 
 from daklib.config import Config
@@ -84,9 +84,9 @@ def main():
         if not cnf.has_key("Import-LDAP-Fingerprints::Options::%s" % (i)):
             cnf["Import-LDAP-Fingerprints::Options::%s" % (i)] = ""
 
-    apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
 
-    Options = cnf.SubTree("Import-LDAP-Fingerprints::Options")
+    Options = cnf.subtree("Import-LDAP-Fingerprints::Options")
     if Options["Help"]:
         usage()
 
@@ -173,7 +173,7 @@ SELECT f.fingerprint, f.id, u.uid FROM fingerprint f, uid u WHERE f.uid = u.id
                 print "Assigning %s to 0x%s." % (uid, fingerprint)
         else:
             extra_keyrings = ""
-            for keyring in cnf.ValueList("Import-LDAP-Fingerprints::ExtraKeyrings"):
+            for keyring in cnf.value_list("Import-LDAP-Fingerprints::ExtraKeyrings"):
                 extra_keyrings += " --keyring=%s" % (keyring)
             cmd = "gpg %s %s --list-key %s" \
                   % (utils.gpg_keyring_args(), extra_keyrings, fingerprint)