Reduce duplication in test scripts, more logging.

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

diff --git a/wizard/command/upgrade.py b/wizard/command/upgrade.py
index 0d90a562f1f977bb566ac8f975f27abd9658086f..476c1b78ca3890be9715227ac3bb382dff42adfb 100644 (file)
--- a/wizard/command/upgrade.py
+++ b/wizard/command/upgrade.py
@@ -145,7 +145,7 @@ def main(argv, baton):
                 except deploy.WebVerificationError as e:
                     logging.warning("Web verification failed: rolling back")
                     perform_restore(d, backup)
-                    raise app.UpgradeVerificationFailure(e.contents)
+                    raise app.UpgradeVerificationFailure()
         # XXX: frob .htaccess to make site accessible
         #       to do this, check if .htaccess changed, first.  Upgrade
         #       process might have frobbed it.  Don't be
@@ -232,7 +232,10 @@ def perform_merge(sh, repo, d, wc, version, use_shm, kib_avail):
             "-p", base_virtual_commit, input="", log=True)
     sh.call("git", "checkout", user_virtual_commit, "--")
     wc.prepareMerge()
-    sh.call("git", "commit", "--amend", "-a", "-m", "amendment")
+    try:
+        sh.call("git", "commit", "--amend", "-a", "-m", "amendment")
+    except shell.CallError as e:
+        pass
     try:
         sh.call("git", "merge", next_virtual_commit)
     except shell.CallError as e: