Rename contents subcommands to be consistent with metadata.

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/dak/contents.py b/dak/contents.py
index bc761f4f488b756794eed65ce1bd207824f4bec5..9c85a50abe94b68c0750d7f548f6f14898fa050d 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
 """
@@ -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'])