self.prod.verify()
self.prod.verifyDatabase()
self.prod.verifyTag(options.srv_path)
- self.prod.verifyGit(options.srv_path)
+ try:
+ self.prod.verifyGit(options.srv_path)
+ except deploy.InconsistentWizardTagError:
+ shell.call("git", "fetch")
+ shell.call("git", "fetch", "--tags")
+ shell.call("wizard", "remaster")
+ self.prod.verifyGit(options.srv_path)
+ except deploy.HeadNotDescendantError:
+ shell.call("wizard", "remaster")
+ self.prod.verifyGit(options.srv_path)
if not options.skip_verification:
self.prod.verifyConfigured()
try:
self.temp_dir = tempfile.mkdtemp(prefix="wizard", dir=dir)
self.temp_wc_dir = os.path.join(self.temp_dir, "repo")
logging.info("Using temporary directory: " + self.temp_wc_dir)
- shell.call("git", "clone", "-q", "--shared", ".", self.temp_wc_dir)
+ shell.call("git", "clone", "-q", ".", self.temp_wc_dir)
def mergeSaveState(self):
"""Save variables so that ``--continue`` will work."""
# yeah yeah no trailing newline whatever