Use CLI installer for MediaWiki 1.17.0 and later.

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

diff --git a/wizard/command/upgrade.py b/wizard/command/upgrade.py
index be549cac0d267c971622b1cccd83dfccc886213c..f963cf487301eb55d6866086e24f84670e17a417 100644 (file)
--- a/wizard/command/upgrade.py
+++ b/wizard/command/upgrade.py
@@ -290,7 +290,7 @@ class Upgrade(object):
         self.temp_dir = tempfile.mkdtemp(prefix="wizard", dir=dir)
         self.temp_wc_dir = os.path.join(self.temp_dir, "repo")
         logging.info("Using temporary directory: " + self.temp_wc_dir)
-        shell.call("git", "clone", "-q", "--shared", ".", self.temp_wc_dir)
+        shell.call("git", "clone", "-q", ".", self.temp_wc_dir)
     def mergeSaveState(self):
         """Save variables so that ``--continue`` will work."""
         # yeah yeah no trailing newline whatever
@@ -440,7 +440,11 @@ class Upgrade(object):
                     # run update script
                     self.prod.upgrade(version_obj, self.options)
                     self.verifyWeb()
-                    os.unlink(self.prod.pending_file)
+                    try:
+                        os.unlink(self.prod.pending_file)
+                    except OSError as e:
+                        if e.errno != errno.ENOENT:
+                            raise
                 except app.UpgradeFailure:
                     logging.warning("Upgrade failed: rolling back")
                     self.upgradeRollback(backup)