Change clobber logic to be explicit

bin/cbuildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """CBuildbot is wrapper around the build process used by the pre-flight queue"""
 
 import errno
 import re
@@ skipping 358 matching lines @@
 def main():
   # Parse options
   usage = "usage: %prog [options] cbuildbot_config"
   parser = optparse.OptionParser(usage=usage)
   parser.add_option('-r', '--buildroot',
                     help='root directory where build occurs', default=".")
   parser.add_option('-n', '--buildnumber',
                     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])
   else:
     print >> sys.stderr, "Missing configuration description"
     parser.print_usage()
     sys.exit(1)
 
   try:
     if not os.path.isdir(buildroot):
@@ skipping 28 matching lines @@
           _UprevCleanup(buildroot)
           sys.stderr('CBUILDBOT - One of the slaves has failed!!!')
           sys.exit(1)
       else:
         # Publish my status to the master if its expecting it.
         if buildconfig['important']:
           cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE)
 
         _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)
 
     raise
 
 
 if __name__ == '__main__':
     main()