Move a number of common parameters to the baton.

[wizard.git] / wizard / command / mass_migrate.py

diff --git a/wizard/command/mass_migrate.py b/wizard/command/mass_migrate.py
index 00dd006f81cd1db21b289bbb2d9629392ce57d07..b72bfd4d1f3afe9dfcc38bc44cc048d940bb19c0 100644 (file)
--- a/wizard/command/mass_migrate.py
+++ b/wizard/command/mass_migrate.py
@@ -15,7 +15,7 @@ def main(argv, baton):
     options, args = parse_args(argv, baton)
     app = args[0]
     base_args = calculate_base_args(options)
-    sh = shell.ParallelShell.make(options.no_parallelize, options.max)
+    sh = shell.ParallelShell.make(options.no_parallelize, options.max_processes)
     seen = sset.make(options.seen)
     is_root = not os.getuid()
     warnings_log, errors_log = command.open_logs(options.log_dir)
@@ -82,19 +82,13 @@ user for testing purposes, but then you MUST NOT run this on
 untrusted repositories."""
     parser = command.WizardOptionParser(usage)
     baton.push(parser, "log_dir")
-    parser.add_option("--seen", dest="seen",
-            default=None, help="File to read/write paths of already processed installs."
-            "These will be skipped.")
-    parser.add_option("--no-parallelize", dest="no_parallelize", action="store_true",
-            default=False, help="Turn off parallelization")
-    parser.add_option("--dry-run", dest="dry_run", action="store_true",
-            default=False, help="Print commands that would be run. Implies --no-parallelize")
-    parser.add_option("--max", dest="max", type="int",
-            default=10, help="Maximum subprocesses to run concurrently")
+    baton.push(parser, "seen")
+    baton.push(parser, "no_parallelize")
+    baton.push(parser, "dry_run")
+    baton.push(parser, "max_processes")
     parser.add_option("--force", dest="force", action="store_true",
             default=False, help="Force migrations to occur even if .scripts or .git exists.")
-    parser.add_option("--limit", dest="limit", type="int",
-            default=None, help="Limit the number of autoinstalls to look at.")
+    baton.push(parser ,"limit")
     baton.push(parser, "versions_path")
     baton.push(parser, "srv_path")
     options, args, = parser.parse_all(argv)