Fix pylint errors.

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

diff --git a/wizard/command/migrate.py b/wizard/command/migrate.py
index b159427dbed5b2972f378a1867cd1205a94b6d38..0393c8fd69635c5d54dd75228f43d9ddbc596195 100644 (file)
--- a/wizard/command/migrate.py
+++ b/wizard/command/migrate.py
@@ -11,7 +11,7 @@ def main(argv, baton):
     options, args = parse_args(argv, baton)
     dir = args[0]
 
-    shell.drop_priviledges(dir, options)
+    shell.drop_priviledges(dir, options.log_file)
 
     util.chdir(dir)
     sh = shell.Shell(options.dry_run)
@@ -19,7 +19,7 @@ def main(argv, baton):
     logging.info("Migrating %s" % dir)
     logging.debug("uid is %d" % os.getuid())
 
-    deployment = deploy.Deployment(".")
+    deployment = deploy.ProductionCopy(".")
 
     # deal with old-style migration, remove this later
     if os.path.isfile(".scripts/old-version") and not os.path.isfile(".scripts-version"):
@@ -33,9 +33,7 @@ def main(argv, baton):
     except deploy.NotMigratedError:
         pass
     except (deploy.CorruptedAutoinstallError, AlreadyMigratedError):
-        if options.force:
-            perform_force(options)
-        else:
+        if not options.force:
             raise
 
     deployment.verifyTag(options.srv_path)
@@ -45,26 +43,21 @@ def main(argv, baton):
     else:
         deployment.verifyVersion()
         version = deployment.app_version
-    repo    = version.application.repository(options.srv_path)
-    tag     = version.scripts_tag
+    repo = version.application.repository(options.srv_path)
+    tag = version.scripts_tag
 
-    # XXX: turn this into a context
-    try:
-        try:
-            os.open(".scripts-migrate-lock", os.O_CREAT | os.O_EXCL)
-        except OSError as e:
-            if e.errno == errno.EEXIST:
-                raise DirectoryLockedError
-            elif e.errno == errno.EACCES:
-                raise command.PermissionsError(dir)
-            raise
-        make_repository(sh, options, repo, tag)
-        check_variables(deployment, options)
-    finally:
+    with util.LockDirectory(".scripts-migrate-lock"):
         try:
-            os.unlink(".scripts-migrate-lock")
-        except OSError:
-            pass
+            if options.force:
+                perform_force(options)
+            make_repository(sh, options, repo, tag)
+            check_variables(deployment, options)
+        except KeyboardInterrupt:
+            # revert it; barring zany race conditions this is safe
+            if os.path.exists(".scripts"):
+                shutil.rmtree(".scripts")
+            if os.path.exists(".git"):
+                shutil.rmtree(".git")
 
 def parse_args(argv, baton):
     usage = """usage: %prog migrate [ARGS] DIR
@@ -99,24 +92,13 @@ def perform_force(options):
 
     if has_git:
         logging.warning("Force removing .git directory")
-        if not options.dry_run: backup = safe_unlink(".git")
+        if not options.dry_run: backup = util.safe_unlink(".git")
         logging.info(".git backed up to %s" % backup)
     if has_scripts:
         logging.warning("Force removing .scripts directory")
-        if not options.dry_run: backup = safe_unlink(".scripts")
+        if not options.dry_run: backup = util.safe_unlink(".scripts")
         logging.info(".scripts backed up to %s" % backup)
 
-def safe_unlink(file):
-    """Moves a file to a backup location."""
-    prefix = "%s.bak" % file
-    name = None
-    for i in itertools.count():
-        name = "%s.%d" % (prefix, i)
-        if not os.path.exists(name):
-            break
-    os.rename(file, name)
-    return name
-
 def make_repository(sh, options, repo, tag):
     sh.call("git", "init") # create repository
     # configure our alternates (to save space and make this quick)
@@ -178,13 +160,3 @@ ERROR: Directory already contains a .git and
 both of these directories will be removed.
 """
 
-class DirectoryLockedError(Error):
-    def __init__(self, dir):
-        self.dir = dir
-    def __str__(self):
-        return """
-
-ERROR: Could not acquire lock on directory.  Maybe there is
-another migration process running?
-"""
-