Rename logging and base args, fix pylint errors.

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

diff --git a/wizard/command/mass_migrate.py b/wizard/command/mass_migrate.py
index 200743052c4b4f75efb57e42bdede0fb88eedeb4..95d975eb3ee7ed5a8a6ceff77cf13016e358ee44 100644 (file)
--- a/wizard/command/mass_migrate.py
+++ b/wizard/command/mass_migrate.py
@@ -42,7 +42,7 @@ def main(argv, baton):
             # we need to make another stack frame so that d and i get specific bindings.
             def on_success(stdout, stderr):
                 if stderr:
-                    report.warnings.write("%s\n" % d.location)
+                    report.warnings.write("%s\n" % d.location) # pylint: disable-msg=E1101
                     logging.warning("Warnings [%04d] %s:\n%s" % (i, d.location, stderr))
                 seen.add(d.location)
             def on_error(e):
@@ -55,7 +55,7 @@ def main(argv, baton):
                     if name not in errors: errors[name] = []
                     errors[name].append(d)
                     logging.error("%s in [%04d] %s" % (name, i, d.location))
-                    report.errors.write("%s\n" % d.location)
+                    report.errors.write("%s\n" % d.location) # pylint: disable-msg=E1101
             return (on_success, on_error)
         on_success, on_error = make_on_pair(d, i)
         sh.call("wizard", "migrate", d.location, *child_args,
@@ -93,6 +93,6 @@ the scripts AFS patch."""
     return options, args
 
 def calculate_base_args(options):
-    return command.makeBaseArgs(options, dry_run="--dry-run", srv_path="--srv-path",
+    return command.make_base_args(options, dry_run="--dry-run", srv_path="--srv-path",
             force="--force")