X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/4c1a7a31dcabf709501a4eade25c495f1352ef40..10fea9a7ddab6a654922514b13b135772cc98a01:/wizard/command/migrate.py diff --git a/wizard/command/migrate.py b/wizard/command/migrate.py index 259d2e7..d3dce85 100644 --- a/wizard/command/migrate.py +++ b/wizard/command/migrate.py @@ -1,19 +1,16 @@ import os +import os.path import shutil import logging -from wizard import command, deploy, shell, util +from wizard import app, command, deploy, shell, util def main(argv, baton): options, args = parse_args(argv, baton) - if args: - dir = args[0] - else: - dir = os.getcwd() - + dir = os.path.abspath(args[0]) if args else os.getcwd() shell.drop_priviledges(dir, options.log_file) - util.chdir(dir) + sh = shell.Shell(options.dry_run) logging.info("Migrating %s" % dir) @@ -21,40 +18,46 @@ def main(argv, baton): 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"): - os.rename(".scripts/old-version", ".scripts-version") - os.unsetenv("GIT_DIR") # prevent some perverse errors 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 - deployment.verifyTag(options.srv_path) - if options.force_version: - version = deployment.application.makeVersion(options.force_version) + deployment.setAppVersion(deployment.application.makeVersion(options.force_version)) else: try: deployment.verifyVersion() - version = deployment.app_version except deploy.VersionMismatchError as e: # well, we'll use that then - version = deployment.application.makeVersion(str(e.real_version)) - repo = version.application.repository(options.srv_path) - tag = version.scripts_tag + deployment.setAppVersion(deployment.application.makeVersion(str(e.real_version))) + + deployment.verifyTag(options.srv_path) + + 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(version.version) + raise UnsupportedVersion(deployment.version) - with util.LockDirectory(".scripts-migrate-lock"): + with util.LockDirectory(".wizard-migrate-lock"): try: if options.force: perform_force(options) @@ -62,8 +65,8 @@ def main(argv, baton): 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(".wizard"): + shutil.rmtree(".wizard") if os.path.exists(".git"): shutil.rmtree(".git") @@ -74,19 +77,21 @@ 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," + 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 tells lies, explicitly specify" + 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") @@ -94,16 +99,16 @@ NOT run this command as root.""" def perform_force(options): has_git = os.path.isdir(".git") - has_scripts = os.path.isdir(".scripts") + 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_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) + 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 @@ -120,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 @@ -130,11 +135,11 @@ 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()