From 66661442d6aa7012846b6fd7e1487f809339fd24 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Wed, 17 Jun 2009 00:46:37 -0400 Subject: [PATCH] Final touches on migration script. Signed-off-by: Edward Z. Yang --- lib/wizard/command/migrate.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/wizard/command/migrate.py b/lib/wizard/command/migrate.py index dbf93d3..dc5f5aa 100644 --- a/lib/wizard/command/migrate.py +++ b/lib/wizard/command/migrate.py @@ -85,6 +85,8 @@ what repository and tag to use.""" parser = WizardOptionParser(usage) parser.add_option("--dry-run", dest="dry_run", action="store_true", default=False, help="Prints would would be run without changing anything") + parser.add_option("--force", "-f", dest="force", action="store_true", + default=False, help="If .git or .scripts directory already exists, delete them and migrate") options, args, logger = parser.parse_all(argv, logger) if len(args) > 1: parser.error("too many arguments") @@ -99,8 +101,16 @@ what repository and tag to use.""" elif e.errno == 2: raise NoSuchDirectoryError(dir) else: raise e - if os.path.isdir(".git"): - raise AlreadyMigratedError(dir) + if os.path.isdir(".git") or os.path.isdir(".scripts"): + if not options.force: + raise AlreadyMigratedError(dir) + else: + if os.path.isdir(".git"): + logger.warning("Force removing .git directory") + shutil.rmtree(".git") + if os.path.isdir(".scripts"): + logger.warning("Force removing .scripts directory") + shutil.rmtree(".scripts") try: deploy = wd.Deployment.fromDir(".") version = deploy.getAppVersion() @@ -144,12 +154,12 @@ what repository and tag to use.""" did_git_checkout_scripts = True # XXX: setup .scripts/version??? # for verbose purposes, give us a git status and git diff - raise NotImplementedError if options.verbose: shell.call("git", "status") shell.call("git", "diff") except: - logger.error("ERROR: Exception detected! Rolling back...") + # this... is pretty bad + logger.critical("ERROR: Exception detected! Rolling back...") if did_git_init: shell.call("rm", "-Rf", ".git") if did_git_checkout_scripts: -- 2.45.2