Add some information to cbuildbot output.

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.
+
 import errno
 import optparse
 import os
 import shutil
 import subprocess
+import sys
 
 from cbuildbot_config import config
 
 # Utility functions
 
 def RunCommand(cmd, error_ok=False, error_message=None, exit_code=False,
                redirect_stdout=False, redirect_stderr=False, cwd=None,
                input=None):
-  # Useful for debugging:
-  # print >>sys.stderr, "RunCommand:", ' '.join(cmd)
+  # Print out the command before running.
+  print >>sys.stderr, "CBUILDBOT -- RunCommand:", ' '.join(cmd)
   if redirect_stdout:
     stdout = subprocess.PIPE
   else:
     stdout = None
   if redirect_stderr:
     stderr = subprocess.PIPE
   else:
     stderr = None
   if input:
     stdin = subprocess.PIPE
@@ skipping 69 matching lines @@
   buildconfig = {}
   if config.has_key(config_name):
     buildconfig = config[config_name]
   for key in default.iterkeys():
     if not buildconfig.has_key(key):
       buildconfig[key] = default[key]
   return buildconfig
 
 def main():
   # Parse options
-  parser = optparse.OptionParser()
+  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)
   (options, args) = parser.parse_args()
 
   buildroot = options.buildroot
-  buildconfig = _GetConfig(args[0])
-
+  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):
       _FullCheckout(buildroot)
     else:
       _IncrementalCheckout(buildroot)
     chroot_path = os.path.join(buildroot, 'chroot')
     if not os.path.isdir(chroot_path):
       _MakeChroot(buildroot)
     boardpath = os.path.join(chroot_path, 'build', buildconfig['board'])
     if not os.path.isdir(boardpath):
       _SetupBoard(buildroot, board=buildconfig['board'])
     if buildconfig['uprev']:
       _UprevPackages(buildroot)
     _Build(buildroot)
     if buildconfig['uprev']:
       _UprevPush(buildroot)
       _UprevCleanup(buildroot)
   except:
     # something went wrong, cleanup (being paranoid) for next build
     RunCommand(['sudo', 'rm', '-rf', buildroot])
     raise
 
 if __name__ == '__main__':
     main()