Fix bugs with new reporting code.

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

diff --git a/wizard/command/mass_upgrade.py b/wizard/command/mass_upgrade.py
index 3bd257a16a00e1f5a6fb72fc6c57f9d869252fed..78dcd66838969f0d8158487cfd3e884e0adb3c33 100644 (file)
--- a/wizard/command/mass_upgrade.py
+++ b/wizard/command/mass_upgrade.py
@@ -16,9 +16,9 @@ def main(argv, baton):
     app = args[0]
     base_args = calculate_base_args(options)
     sh = shell.ParallelShell.make(options.no_parallelize, options.max_processes)
+    command.create_logdir(options.log_dir)
     seen = sset.make(options.seen)
     is_root = not os.getuid()
-    command.create_logdir(options.log_dir)
     lookup_report, warnings_report, errors_report, merge_report, verify_report = command.open_reports(options.log_dir, ('lookup', 'warnings', 'errors', 'merge', 'verify'))
     # loop stuff
     errors = {}
@@ -65,8 +65,6 @@ def main(argv, baton):
                     fails['merge'] += 1
                 else:
                     name = e.name
-                    if name not in errors: errors[name] = []
-                    errors[name].append(d)
                     if name == "WebVerificationError":
                         try:
                             host, path = scripts.get_web_host_and_path(d.location)
@@ -79,6 +77,8 @@ def main(argv, baton):
                         verify_report.write("[%04d] %s\n" % (i, url))
                         fails['verify'] += 1
                     else:
+                        if name not in errors: errors[name] = []
+                        errors[name].append(d)
                         msg = "[%04d] %s in %s" % (i, name, d.location)
                         logging.error(msg)
                         errors_report.write(msg + "\n")
@@ -90,7 +90,7 @@ def main(argv, baton):
     for name, deploys in errors.items():
         logging.warning("%s from %d installs" % (name, len(deploys)))
     def printPercent(description, number, total):
-        return "%d out of %d installs (%.1f%%) had %s" % (number, total, float(number)/total*100, description)
+        logging.warning("%d out of %d installs (%.1f%%) had %s" % (number, total, float(number)/total*100, description))
     if fails['merge']:
         printPercent("merge conflicts", fails['merge'], i)
     if fails['verify']: