X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=dak%2Fcontents.py;h=407b3c06475dfae80229d676175bbec415d7fd35;hp=c2d04eb697dd683c176ebe6e1f4581887b43893a;hb=0d69fff35ef45fda573467873ae2f01ca1954650;hpb=5dd1abb51a109c976351ebd6ecd5018e26ee4dc0

diff --git a/dak/contents.py b/dak/contents.py
index c2d04eb6..407b3c06 100755
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -67,6 +67,9 @@ OPTIONS
         show this help and exit
 
 OPTIONS for generate
+     -a, --archive=ARCHIVE
+        only operate on suites in the specified archive
+
      -s, --suite={stable,testing,unstable,...}
         only operate on specified suite names
 
@@ -84,15 +87,15 @@ OPTIONS for scan-source and scan-binary
 
 ################################################################################
 
-def write_all(cnf, suite_names = [], component_names = [], force = None):
-    Logger = daklog.Logger(cnf.Cnf, 'contents generate')
-    ContentsWriter.write_all(Logger, suite_names, component_names, force)
+def write_all(cnf, archive_names = [], suite_names = [], component_names = [], force = None):
+    Logger = daklog.Logger('contents generate')
+    ContentsWriter.write_all(Logger, archive_names, 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 +105,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
@@ -119,13 +122,14 @@ def main():
     cnf['Contents::Options::Limit'] = ''
     cnf['Contents::Options::Force'] = ''
     arguments = [('h', "help",      'Contents::Options::Help'),
+                 ('a', 'archive',   'Contents::Options::Archive',   'HasArg'),
                  ('s', "suite",     'Contents::Options::Suite',     "HasArg"),
                  ('c', "component", 'Contents::Options::Component', "HasArg"),
                  ('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()
@@ -142,13 +146,14 @@ def main():
         binary_scan_all(cnf, limit)
         return
 
+    archive_names   = utils.split_args(options['Archive'])
     suite_names     = utils.split_args(options['Suite'])
     component_names = utils.split_args(options['Component'])
 
     force = bool(options['Force'])
 
     if args[0] == 'generate':
-        write_all(cnf, suite_names, component_names, force)
+        write_all(cnf, archive_names, suite_names, component_names, force)
         return
 
     usage()