X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontents.py;h=f36e96dcaf0449749bef146ae19fe5f4995b5e5c;hb=2bf549a8b6e6bb374d52ae0ea9bf329b91ab41a8;hp=c2d04eb697dd683c176ebe6e1f4581887b43893a;hpb=b36379705f3f2a52788ad19cf1da339c4edf339d;p=dak.git

diff --git a/dak/contents.py b/dak/contents.py
index c2d04eb6..f36e96dc 100755
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -85,14 +85,14 @@ OPTIONS for scan-source and scan-binary
 ################################################################################
 
 def write_all(cnf, suite_names = [], component_names = [], force = None):
-    Logger = daklog.Logger(cnf.Cnf, 'contents generate')
+    Logger = daklog.Logger('contents generate')
     ContentsWriter.write_all(Logger, suite_names, component_names, force)
     Logger.close()
 
 ################################################################################
 
 def binary_scan_all(cnf, limit):
-    Logger = daklog.Logger(cnf.Cnf, 'contents scan-binary')
+    Logger = daklog.Logger('contents scan-binary')
     result = BinaryContentsScanner.scan_all(limit)
     processed = '%(processed)d packages processed' % result
     remaining = '%(remaining)d packages remaining' % result
@@ -102,7 +102,7 @@ def binary_scan_all(cnf, limit):
 ################################################################################
 
 def source_scan_all(cnf, limit):
-    Logger = daklog.Logger(cnf.Cnf, 'contents scan-source')
+    Logger = daklog.Logger('contents scan-source')
     result = SourceContentsScanner.scan_all(limit)
     processed = '%(processed)d packages processed' % result
     remaining = '%(remaining)d packages remaining' % result
@@ -124,8 +124,8 @@ def main():
                  ('l', "limit",     'Contents::Options::Limit',     "HasArg"),
                  ('f', "force",     'Contents::Options::Force'),
                 ]
-    args = apt_pkg.ParseCommandLine(cnf.Cnf, arguments, sys.argv)
-    options = cnf.SubTree('Contents::Options')
+    args = apt_pkg.parse_commandline(cnf.Cnf, arguments, sys.argv)
+    options = cnf.subtree('Contents::Options')
 
     if (len(args) != 1) or options['Help']:
         usage()