Make uninstalls smoother.

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

diff --git a/wizard/command/prepare_upgrade.py b/wizard/command/prepare_upgrade.py
index 44813dae4d66f11b66cb85f90c612d47961c11f2..cb9c6152816b6aabc911d32c9b086ea1917d2e1f 100644 (file)
--- a/wizard/command/prepare_upgrade.py
+++ b/wizard/command/prepare_upgrade.py
@@ -53,6 +53,8 @@ def main(argv, baton):
         with util.ChangeDirectory(options.test_dir):
             shell.call("./%s-install-test.sh" % av.application.name, addenv={'WIZARD_NO_COMMIT': '1'}, stdout=sys.stdout, stderr=sys.stderr)
             with util.ChangeDirectory("testdir_%s_install_head" % av.application.name):
+                shell.call("git", "stash")
+                shell.call("git", "stash", "apply")
                 shell.call("wizard", "prepare-config")
                 if shell.eval("git", "ls-files", "--modified").strip():
                     print
@@ -60,6 +62,7 @@ def main(argv, baton):
                     print "Don't forget to make the %s tag when you're done" % av.wizard_tag
                     print "Check %s for more details" % os.getcwd()
                     sys.exit(1)
+                shell.call("git", "stash", "apply") # so that uninstalls work
     shell.call("git", "tag", av.wizard_tag)
 
 def parse_args(argv, baton):