import os
-import itertools
import shutil
import logging
-import errno
-import sys
from wizard import command, deploy, shell, util
def main(argv, baton):
options, args = parse_args(argv, baton)
- dir = args[0]
+ if args:
+ dir = args[0]
+ else:
+ dir = os.getcwd()
- shell.drop_priviledges(dir, options)
+ shell.drop_priviledges(dir, options.log_file)
util.chdir(dir)
sh = shell.Shell(options.dry_run)
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"):
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)
- version = deployment.app_version
- repo = version.application.repository(options.srv_path)
- tag = version.scripts_tag
+ if options.force_version:
+ version = deployment.application.makeVersion(options.force_version)
+ else:
+ deployment.verifyVersion()
+ version = deployment.app_version
+ repo = version.application.repository(options.srv_path)
+ tag = version.scripts_tag
- try:
+ with util.LockDirectory(".scripts-migrate-lock"):
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)
- make_repository(sh, options, repo, tag)
- check_variables(deployment, options)
- finally:
- 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
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")
+ default=False, help="If .git or .scripts directory already exists,"
+ "delete them and migrate")
+ parser.add_option("--force-version", dest="force_version",
+ default=None, help="If .scripts-version tells lies, explicitly specify"
+ "a version to migrate to.")
options, args = parser.parse_all(argv)
if len(args) > 1:
parser.error("too many arguments")
- elif not args:
- parser.error("must specify directory")
return (options, args)
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)
pass
class AlreadyMigratedError(Error):
+ quiet = True
def __init__(self, dir):
self.dir = dir
def __str__(self):
return """
-ERROR: Directory already contains a .git and
-.scripts directory. If you force this migration,
-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?
+This autoinstall is already migrated; move along, nothing to
+see here. (If you really want to, you can force a re-migration
+with --force, but this will blow away the existing .git and
+.scripts directories (i.e. your history and Wizard configuration).)
"""