X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_maintainers.py;h=b7f729857d20b47baa66f69df544024a09ffe72b;hb=4d8b174b33c1816762251a27dc9325138c8d8f6b;hp=2909a3574313d1dc4e946bc9a613ff615bc4e55b;hpb=da255f7aa512ef7f500c80ad41c48516d772306f;p=dak.git

diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py
index 2909a357..b7f72985 100755
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@ -31,6 +31,7 @@ Generate Maintainers file used by e.g. the Debian Bug Tracking System
 
 ################################################################################
 
+from daklib import daklog
 from daklib import utils
 from daklib.config import Config
 from daklib.dbconn import *
@@ -70,12 +71,13 @@ def main():
     if not cnf.has_key("Make-Maintainers::Options::Help"):
         cnf["Make-Maintainers::Options::Help"] = ""
 
-    extra_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Make-Maintainers::Options")
+    extra_files = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Make-Maintainers::Options")
 
     if Options["Help"]:
         usage()
 
+    Logger = daklog.Logger('make-maintainers')
     session = DBConn().session()
 
     # dictionary packages to maintainer names
@@ -91,15 +93,18 @@ def main():
         select distinct on (package) * from binaries
             order by package, version desc''')
 
+    Logger.log(['sources'])
     for source in source_query:
         maintainers[source.source] = source.maintainer.name
         uploaders[source.source] = uploader_list(source)
 
+    Logger.log(['binaries'])
     for binary in binary_query:
         if binary.package not in maintainers:
             maintainers[binary.package] = binary.maintainer.name
             uploaders[binary.package] = uploader_list(binary.source)
 
+    Logger.log(['files'])
     # Process any additional Maintainer files (e.g. from pseudo
     # packages)
     for filename in extra_files:
@@ -120,6 +125,7 @@ def main():
             uploader_file.write(format(package, uploader))
     uploader_file.close()
     maintainer_file.close()
+    Logger.close()
 
 ################################################################################