Index: bin/cbuildbot.py |
diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py |
index 4eee360b70affa85e9eec0b5b00004be195d76da..08ad2229b5647e0b3bc737bc0f6f263f46185ff7 100755 |
--- a/bin/cbuildbot.py |
+++ b/bin/cbuildbot.py |
@@ -376,14 +376,17 @@ def main(): |
help='build number', type='int', default=0) |
parser.add_option('-f', '--revisionfile', |
help='file where new revisions are stored') |
- parser.add_option('--noclobber', action='store_false', dest='clobber', |
- default=True, |
- help='Disables clobbering the buildroot on failure') |
+ parser.add_option('--clobber', action='store_true', dest='clobber', |
+ default=False, |
+ help='Clobbers an old checkout before syncing') |
(options, args) = parser.parse_args() |
buildroot = options.buildroot |
revisionfile = options.revisionfile |
- clobber = options.clobber |
+ |
+ # Passed option to clobber. |
+ if options.clobber: |
+ RunCommand(['sudo', 'rm', '-rf', buildroot]) |
if len(args) == 1: |
buildconfig = _GetConfig(args[0]) |
@@ -432,10 +435,6 @@ def main(): |
_UprevCleanup(buildroot) |
except: |
- # Something went wrong, cleanup (being paranoid) for next build. |
- if clobber: |
- RunCommand(['sudo', 'rm', '-rf', buildroot], print_cmd=False) |
- |
# Send failure to master bot. |
if not buildconfig['master'] and buildconfig['important']: |
cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_FAILED) |