Revert "Add more error checking to preflight queue."

cros_mark_as_stable.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.
 
 """This module uprevs a given package's ebuild to the next revision."""
 
 
 import fileinput
 import gflags
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), 'lib'))
 from cros_build_lib import Info, RunCommand, Warning, Die
 
 
 gflags.DEFINE_string('board', '',
                      'Board for which the package belongs.', short_name='b')
 gflags.DEFINE_string('overlays', '',
-                     'Colon-separated list of overlays to modify.',
+                     'Space separated list of overlays to modify.',
                      short_name='o')
 gflags.DEFINE_string('packages', '',
-                     'Colon-separated list of packages to mark as stable.',
+                     'Space separated list of packages to mark as stable.',
                      short_name='p')
 gflags.DEFINE_string('push_options', '',
                      'Options to use with git-cl push using push command.')
 gflags.DEFINE_string('srcroot', '%s/trunk/src' % os.environ['HOME'],
                      'Path to root src directory.',
                      short_name='r')
 gflags.DEFINE_string('tracking_branch', 'cros/master',
                      'Used with commit to specify branch to track against.',
                      short_name='t')
 gflags.DEFINE_boolean('all', False,
@@ skipping 199 matching lines @@
   _SimpleRunCommand('git commit -m "%s"' % description)
   # Ugh. There has got to be an easier way to push to a tracking branch
   _SimpleRunCommand('git config push.default tracking')
   _SimpleRunCommand('git push')
 
 
 def _SimpleRunCommand(command):
   """Runs a shell command and returns stdout back to caller."""
   _Print('  + %s' % command)
   proc_handle = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
-  stdout = proc_handle.communicate()[0]
-  retcode = proc_handle.wait()
-  assert retcode == 0, "Return code %s for command: %s" % (retcode, command)
-  return stdout
+  return proc_handle.communicate()[0]
 
 
 # ======================= End Global Helper Functions ========================
 
 
 class _GitBranch(object):
   """Wrapper class for a git branch."""
 
   def __init__(self, branch_name):
     """Sets up variables but does not create the branch."""
@@ skipping 221 matching lines @@
 def main(argv):
   try:
     argv = gflags.FLAGS(argv)
     if len(argv) != 2:
       _PrintUsageAndDie('Must specify a valid command')
     else:
       command = argv[1]
   except gflags.FlagsError, e :
     _PrintUsageAndDie(str(e))
 
-  package_list = gflags.FLAGS.packages.split(':')
+  package_list = gflags.FLAGS.packages.split()
   _CheckSaneArguments(package_list, command)
   if gflags.FLAGS.overlays:
-    overlays = {}
-    for path in gflags.FLAGS.overlays.split(':'):
-      if not os.path.exists(path):
-        Die('Cannot find overlay: %s' % path)
-      overlays[path] = []
+    overlays = dict((path, []) for path in gflags.FLAGS.overlays.split())
   else:
-    Warning('Missing --overlays argument')
     overlays = {
       '%s/private-overlays/chromeos-overlay' % gflags.FLAGS.srcroot: [],
       '%s/third_party/chromiumos-overlay' % gflags.FLAGS.srcroot: []
     }
 
   if command == 'commit':
     _BuildEBuildDictionary(overlays, gflags.FLAGS.all, package_list)
 
   for overlay, ebuilds in overlays.items():
     if not os.path.exists(overlay):
@@ skipping 30 matching lines @@
           raise
 
       if revved_packages:
         _CleanStalePackages(gflags.FLAGS.board, revved_packages)
       else:
         work_branch.Delete()
 
 
 if __name__ == '__main__':
   main(sys.argv)