From 1ec70345d90d5d1b9f51f2eef252e8a08f1a5d90 Mon Sep 17 00:00:00 2001 From: Chris Sosa Date: Mon, 30 Aug 2010 10:48:08 -0700 Subject: [PATCH] Change clobber logic to be explicit TEST=Tested with --clobber and without. Change-Id: I6a938b3da673d97186cec79f25b22ea6176f1fdf Review URL: http://codereview.chromium.org/3238012 --- bin/cbuildbot.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py index 4eee360b70..08ad2229b5 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)