X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fstatic-mirroring%2Fstatic-master-run;h=d9aa164a394f97af4778e55ddd1a80aad0691583;hb=83c98bce49fad95a56e4d52e6dd9d2558439f55a;hp=0d7003d45500e6fc98691c8da6b179f4b2509cdf;hpb=5a0eade9f4a8531e7394b19ddaad072e8f38692d;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/files/static-mirroring/static-master-run b/modules/roles/files/static-mirroring/static-master-run index 0d7003d45..d9aa164a3 100755 --- a/modules/roles/files/static-mirroring/static-master-run +++ b/modules/roles/files/static-mirroring/static-master-run @@ -5,6 +5,7 @@ import os import shutil import subprocess import string +import sys import tempfile import time @@ -162,15 +163,21 @@ def run_mirror(): log("Cleaning up.") shutil.rmtree(tmpdir_old) log("Done.") + return True else: log("Aborted.") + return False +ok = False try: - run_mirror() + ok = run_mirror() finally: for p in cleanup_dirs: if os.path.exists(p): shutil.rmtree(p) + +if not ok: + sys.exit(1) # vim:set et: # vim:set ts=2: # vim:set shiftwidth=2: