Merge remote branch 'mhy/master' into merge

[dak.git] / dak / contents.py

diff --git a/dak/contents.py b/dak/contents.py
index bc761f4f488b756794eed65ce1bd207824f4bec5..ee904b2a2467e4f0d100e03e5dca3396e3587b14 100755 (executable)
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -54,14 +54,14 @@ SUBCOMMANDS
     generate
         generate Contents-$arch.gz files
 
-    binary-scan
-        scan the (u)debs in the existing pool and load contents into the
-        bin_contents table
-
-    source-scan
+    scan-source
         scan the source packages in the existing pool and load contents into
         the src_contents table
 
+    scan-binary
+        scan the (u)debs in the existing pool and load contents into the
+        bin_contents table
+
 OPTIONS
      -h, --help
         show this help and exit
@@ -73,7 +73,7 @@ OPTIONS for generate
      -f, --force
         write Contents files for suites marked as untouchable, too
 
-OPTIONS for binary-scan and source-scan
+OPTIONS for scan-source and scan-binary
      -l, --limit=NUMBER
         maximum number of packages to scan
 """
@@ -89,7 +89,7 @@ def write_all(cnf, suite_names = [], force = None):
 ################################################################################
 
 def binary_scan_all(cnf, limit):
-    Logger = daklog.Logger(cnf.Cnf, 'contents binary_scan')
+    Logger = daklog.Logger(cnf.Cnf, 'contents scan-binary')
     result = BinaryContentsScanner.scan_all(limit)
     processed = '%(processed)d packages processed' % result
     remaining = '%(remaining)d packages remaining' % result
@@ -99,7 +99,7 @@ def binary_scan_all(cnf, limit):
 ################################################################################
 
 def source_scan_all(cnf, limit):
-    Logger = daklog.Logger(cnf.Cnf, 'contents source_scan')
+    Logger = daklog.Logger(cnf.Cnf, 'contents scan-source')
     result = SourceContentsScanner.scan_all(limit)
     processed = '%(processed)d packages processed' % result
     remaining = '%(remaining)d packages remaining' % result
@@ -129,12 +129,12 @@ def main():
     if len(options['Limit']) > 0:
         limit = int(options['Limit'])
 
-    if args[0] == 'binary-scan':
-        binary_scan_all(cnf, limit)
+    if args[0] == 'scan-source':
+        source_scan_all(cnf, limit)
         return
 
-    if args[0] == 'source-scan':
-        source_scan_all(cnf, limit)
+    if args[0] == 'scan-binary':
+        binary_scan_all(cnf, limit)
         return
 
     suite_names = utils.split_args(options['Suite'])