X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/4b2ee92aafcc380eaf4a2c16f9ee08c53ad3a5f8..10fea9a7ddab6a654922514b13b135772cc98a01:/wizard/command/migrate.py diff --git a/wizard/command/migrate.py b/wizard/command/migrate.py index fd39dbe..d3dce85 100644 --- a/wizard/command/migrate.py +++ b/wizard/command/migrate.py @@ -1,87 +1,114 @@ import os +import os.path import shutil import logging -import errno -import sys -from wizard import command, deploy, shell, util +from wizard import app, command, deploy, shell, util def main(argv, baton): - options, args = parse_args(argv) - dir = args[0] + options, args = parse_args(argv, baton) + dir = os.path.abspath(args[0]) if args else os.getcwd() + shell.drop_priviledges(dir, options.log_file) + util.chdir(dir) - logging.debug("uid is %d" % os.getuid()) + sh = shell.Shell(options.dry_run) - command.chdir(dir) - check_if_already_migrated(options) + logging.info("Migrating %s" % dir) + logging.debug("uid is %d" % os.getuid()) - deployment = make_deployment() # uses chdir - version = deployment.app_version - repo = version.application.repository - tag = version.scripts_tag + deployment = deploy.ProductionCopy(".") 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) - make_variables(deployment, options) + try: + deployment.verify() + raise AlreadyMigratedError(deployment.location) + except deploy.NotAutoinstallError: + # Previously, this was a fatal error, but now let's try + # a little harder. + # XXX: The user still has to tell us what application ; a more + # user friendly thing to do is figure it out automatically + if not options.force_app: + raise + # actual version number will get overwritten shortly + deployment.setAppVersion(app.ApplicationVersion.make(options.force_app, "unknown")) + except deploy.NotMigratedError: + # LEGACY + pass + except (deploy.CorruptedAutoinstallError, AlreadyMigratedError): + if not options.force: + raise - if not options.dry_run: - os.rename(".scripts-version", ".scripts/old-version") # archive + if options.force_version: + deployment.setAppVersion(deployment.application.makeVersion(options.force_version)) else: - logging.info("mv .scripts-version .scripts/old-version") + try: + deployment.verifyVersion() + except deploy.VersionMismatchError as e: + # well, we'll use that then + deployment.setAppVersion(deployment.application.makeVersion(str(e.real_version))) + + deployment.verifyTag(options.srv_path) -def parse_args(argv): + repo = deployment.application.repository(options.srv_path) + tag = deployment.app_version.wizard_tag + try: + sh.call("git", "--git-dir=%s" % repo, "rev-parse", tag) + except shell.CallError: + raise UnsupportedVersion(deployment.version) + + with util.LockDirectory(".wizard-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(".wizard"): + shutil.rmtree(".wizard") + if os.path.exists(".git"): + shutil.rmtree(".git") + +def parse_args(argv, baton): usage = """usage: %prog migrate [ARGS] DIR Migrates a directory to our Git-based autoinstall format. Performs basic sanity checking and intelligently determines what repository and tag to use. -This command is meant to be run as the owner of the install -it is upgrading (see the scripts AFS kernel patch). Do -NOT run this command as root.""" +This command is meant to be run as the owner of the install it is +upgrading . Do NOT run this command as root.""" parser = command.WizardOptionParser(usage) + baton.push(parser, "srv_path") 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 .wizard directory already exists, " + "delete them and migrate") + parser.add_option("--force-version", dest="force_version", + default=None, help="If .scripts-version is corrupted or non-existent, explicitly specify " + "a version to migrate to.") + parser.add_option("--force-app", dest="force_app", + default=None, help="If .scripts-version is corrupted or non-existent, explicitly specify " + "an application 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 check_if_already_migrated(options): - 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_wizard = os.path.isdir(".wizard") + + 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_wizard: + logging.warning("Force removing .wizard directory") + if not options.dry_run: backup = util.safe_unlink(".wizard") + logging.info(".wizard backed up to %s" % backup) def make_repository(sh, options, repo, tag): sh.call("git", "init") # create repository @@ -98,7 +125,7 @@ def make_repository(sh, options, repo, tag): else: logging.info("# create %s containing \"%s\"" % (file, data)) logging.info('# create .htaccess containing "Deny from all"') - # configure our remote (this is merely for convenience; wizard scripts + # configure our remote (this is merely for convenience; wizard # will not rely on this) sh.call("git", "remote", "add", "origin", repo) # configure what would normally be set up on a 'git clone' for consistency @@ -108,76 +135,51 @@ def make_repository(sh, options, repo, tag): sh.call("git", "fetch", "origin") # soft reset to our tag sh.call("git", "reset", tag, "--") - # checkout the .scripts directory - sh.call("git", "checkout", ".scripts") + # initialize the .wizard directory + util.init_wizard_dir() + 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()) + message = "Autoinstall migration.\n\n%s" % util.get_git_footer() util.set_git_env() try: message += "\nMigrated-by: " + util.get_operator_git() except util.NoOperatorInfo: pass sh.call("git", "commit", "--allow-empty", "-a", "-m", message) - # 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 -def make_variables(d, options): - """Make .scripts/variables which contains variables based off of - what was regexed out of existing configuration files.""" +def check_variables(d, options): + """Attempt to extract variables and complain if some are missing.""" variables = d.extract() - if not options.dry_run: f = open(".scripts/variables", "w") for k,v in variables.items(): - if v is None: - # once we get everything on the same version, you should - # actually start paying attention to these warnings + if v is None and k not in d.application.deprecated_keys: logging.warning("Variable %s not found" % k) else: logging.debug("Variable %s is %s" % (k,v)) - if not options.dry_run: - f.write("%s %s\n" % (k,v)) - else: - logging.info('# write line "%s %s" to .scripts/variables' % (k,v)) - if not options.dry_run: f.close() class Error(command.Error): """Base exception for all exceptions raised by migrate""" pass class AlreadyMigratedError(Error): + quiet = True def __init__(self, dir): self.dir = dir def __str__(self): return """ -ERROR: Directory already contains a .git and/or -.scripts directory. Did you already migrate it? -""" - -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? +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).) """ -class NoTagError(Error): +class UnsupportedVersion(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) +ERROR: This autoinstall is presently on %s, which is unsupported by +Wizard. Please manually upgrade it to one that is supported, +and then retry the migration; usually the latest version is supported. +""" % self.version