make-changelog. document --archive option

[dak.git] / dak / find_null_maintainers.py

diff --git a/dak/find_null_maintainers.py b/dak/find_null_maintainers.py
index 6074dbee44f1e19292595206de559e989f991fd0..3894f574bfabcb907ef74001520452ba9ff5e357 100755 (executable)
--- a/dak/find_null_maintainers.py
+++ b/dak/find_null_maintainers.py
@@ -24,6 +24,7 @@ import apt_pkg
 
 from daklib.dbconn import *
 from daklib.config import Config
+from daklib.utils import fubar
 
 ################################################################################
 
@@ -52,12 +53,18 @@ def main():
         if not cnf.has_key("Find-Null-Maintainers::Options::%s" % (i)):
             cnf["Find-Null-Maintainers::Options::%s" % (i)] = ""
 
-    apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
 
-    Options = cnf.SubTree("Find-Null-Maintainers::Options")
+    Options = cnf.subtree("Find-Null-Maintainers::Options")
     if Options["Help"]:
         usage()
 
+    if not cnf.has_key('Import-LDAP-Fingerprints::LDAPServer'):
+        fubar("Import-LDAP-Fingerprints::LDAPServer not configured")
+
+    if not cnf.has_key('Import-LDAP-Fingerprints::LDAPDn'):
+        fubar("Import-LDAP-Fingerprints::LDAPDn not configured")
+
     session = DBConn().session()
 
     print "Getting info from the LDAP server..."