import os
+import itertools
import shutil
import logging
import errno
def main(argv, baton):
options, args = parse_args(argv, baton)
dir = args[0]
- command.chdir(dir)
- shell.drop_priviledges(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())
- check_if_already_migrated(options)
+ deployment = deploy.ProductionCopy(".")
- deployment = make_deployment() # uses chdir
- version = deployment.app_version
- repo = version.application.repository(options.srv_path)
- tag = version.scripts_tag
+ # deal with old-style migration, remove this later
+ if os.path.isfile(".scripts/old-version") and not os.path.isfile(".scripts-version"):
+ os.rename(".scripts/old-version", ".scripts-version")
os.unsetenv("GIT_DIR") # prevent some perverse errors
- sh = shell.Shell(options.dry_run)
- check_if_tag_exists(sh, repo, tag)
- make_repository(sh, options, repo, tag)
- check_variables(deployment, options)
+ try:
+ deployment.verify()
+ raise AlreadyMigratedError(deployment.location)
+ except deploy.NotMigratedError:
+ pass
+ except (deploy.CorruptedAutoinstallError, AlreadyMigratedError):
+ if not options.force:
+ raise
- if not options.dry_run:
- deployment.scriptsifyVersion()
- os.rename(".scripts-version", ".scripts/old-version") # archive
+ deployment.verifyTag(options.srv_path)
+
+ if options.force_version:
+ version = deployment.application.makeVersion(options.force_version)
else:
- logging.info("# create .scripts/version containing \"%s-%s-scripts\"" % (deployment.application.name, deployment.version))
- logging.info("mv .scripts-version .scripts/old-version")
+ deployment.verifyVersion()
+ version = deployment.app_version
+ repo = version.application.repository(options.srv_path)
+ tag = version.scripts_tag
+
+ with util.LockDirectory(".scripts-migrate-lock"):
+ try:
+ 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")
parser.error("must specify directory")
return (options, args)
-def check_if_already_migrated(options):
- # XXX: duplicates some logic with Deployment.migrated
- if os.path.isdir(".git") or os.path.isdir(".scripts"):
- if not options.force:
- raise AlreadyMigratedError(dir)
- else:
- if os.path.isdir(".git"):
- logging.warning("Force removing .git directory")
- if not options.dry_run: shutil.rmtree(".git")
- if os.path.isdir(".scripts"):
- logging.warning("Force removing .scripts directory")
- if not options.dry_run: shutil.rmtree(".scripts")
-
-def make_deployment():
- try:
- return deploy.Deployment(".")
- except IOError as e:
- if e.errno == errno.ENOENT:
- raise NotAutoinstallError(dir)
- else: raise e
-
-def check_if_tag_exists(sh, repo, tag):
- # check if the version we're trying to convert exists. We assume
- # a convention here, namely, v1.2.3-scripts is what we want. If
- # you broke the convention... shame on you.
- try:
- sh.call("git", "--git-dir", repo, "rev-parse", tag)
- except shell.CallError:
- raise NoTagError(version)
+def perform_force(options):
+ has_git = os.path.isdir(".git")
+ has_scripts = os.path.isdir(".scripts")
+
+ if has_git:
+ logging.warning("Force removing .git directory")
+ 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 = util.safe_unlink(".scripts")
+ logging.info(".scripts backed up to %s" % backup)
def make_repository(sh, options, repo, tag):
sh.call("git", "init") # create repository
sh.call("git", "reset", tag, "--")
# checkout the .scripts directory
sh.call("git", "checkout", ".scripts")
- # for verbose purposes, give us a git status and git diff
- if options.verbose:
- try:
- sh.call("git", "status")
- except shell.CallError:
- pass
- try:
- sh.call("git", "diff")
- except shell.CallError:
- pass
+ logging.info("Diffstat:\n" + sh.eval("git", "diff", "--stat"))
# commit user local changes
message = "Autoinstall migration of %s locker.\n\n%s" % (util.get_dir_owner(), util.get_git_footer())
util.set_git_env()
def __str__(self):
return """
-ERROR: Directory already contains a .git and/or
-.scripts directory. Did you already migrate it?
+ERROR: Directory already contains a .git and
+.scripts directory. If you force this migration,
+both of these directories will be removed.
"""
-class NotAutoinstallError(Error):
- def __init__(self, dir):
- self.dir = dir
- def __str__(self):
- return """
-
-ERROR: Could not find .scripts-version file. Are you sure
-this is an autoinstalled application?
-"""
-
-class NoTagError(Error):
- def __init__(self, version):
- self.version = version
- def __str__(self):
- return """
-
-ERROR: Could not find tag v%s-scripts in repository
-for %s. Double check and make sure
-the repository was prepared with all necessary tags!
-""" % (self.version.version, self.version.application.name)
scripts.mit.edu / wizard.git / blobdiff