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', '',
-                     'Space separated list of overlays to modify.',
+                     'Colon-separated list of overlays to modify.',
                      short_name='o')
 gflags.DEFINE_string('packages', '',
-                     'Space separated list of packages to mark as stable.',
+                     'Colon-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 39 matching lines @@
     unmerge_host_cmd = ['sudo', 'emerge', '--unmerge']
     unmerge_host_cmd.extend(package_array)
     RunCommand(unmerge_host_cmd)
 
     RunCommand(['eclean-%s' % board, '-d', 'packages'], redirect_stderr=True)
     RunCommand(['sudo', 'eclean', '-d', 'packages'], redirect_stderr=True)
 
 
 def _BestEBuild(ebuilds):
   """Returns the newest EBuild from a list of EBuild objects."""
-  from portage.versions import vercmp
+  from cros_portage_versions import vercmp
   winner = ebuilds[0]
   for ebuild in ebuilds[1:]:
     if vercmp(winner.version, ebuild.version) < 0:
       winner = ebuild
   return winner
 
 
 def _FindUprevCandidates(files):
   """Return a list of uprev candidates from specified list of files.
 
@@ skipping 139 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)
-  return proc_handle.communicate()[0]
+  stdout = proc_handle.communicate()[0]
+  retcode = proc_handle.wait()
+  if retcode != 0:
+    raise subprocess.CalledProcessError(retcode, command, output=stdout)
+  return stdout
 
 
 # ======================= 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 31 matching lines @@
 
 class _EBuild(object):
   """Wrapper class for an ebuild."""
 
   def __init__(self, path):
     """Initializes all data about an ebuild.
 
     Uses equery to find the ebuild path and sets data about an ebuild for
     easy reference.
     """
-    from portage.versions import pkgsplit
+    from cros_portage_versions import pkgsplit
     self.ebuild_path = path
     (self.ebuild_path_no_revision,
      self.ebuild_path_no_version,
      self.current_revision) = self._ParseEBuildPath(self.ebuild_path)
     _, self.category, pkgpath, filename = path.rsplit('/', 3)
     filename_no_suffix = os.path.join(filename.replace('.ebuild', ''))
     self.pkgname, version_no_rev, rev = pkgsplit(filename_no_suffix)
     self.version = '%s-%s' % (version_no_rev, rev)
     self.package = '%s/%s' % (self.category, self.pkgname)
     self.is_workon = False
     self.is_stable = False
 
     for line in fileinput.input(path):
       if line.startswith('inherit ') and 'cros-workon' in line:
         self.is_workon = True
       elif (line.startswith('KEYWORDS=') and '~' not in line and
             ('amd64' in line or 'x86' in line or 'arm' in line)):
         self.is_stable = True
     fileinput.close()
 
   def GetCommitId(self):
     """Get the commit id for this ebuild."""
 
     # Grab and evaluate CROS_WORKON variables from this ebuild.
     unstable_ebuild = '%s-9999.ebuild' % self.ebuild_path_no_version
-    cmd = ('CROS_WORKON_LOCALNAME="%s" CROS_WORKON_PROJECT="%s" '
+    cmd = ('export CROS_WORKON_LOCALNAME="%s" CROS_WORKON_PROJECT="%s"; '
            'eval $(grep -E "^CROS_WORKON" %s) && '
            'echo $CROS_WORKON_PROJECT '
            '$CROS_WORKON_LOCALNAME/$CROS_WORKON_SUBDIR'
            % (self.pkgname, self.pkgname, unstable_ebuild))
     project, subdir = _SimpleRunCommand(cmd).split()
 
     # Calculate srcdir.
     srcroot = gflags.FLAGS.srcroot
     if self.category == 'chromeos-base':
       dir = 'platform'
@@ skipping 143 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 = dict((path, []) for path in gflags.FLAGS.overlays.split())
+    overlays = {}
+    for path in gflags.FLAGS.overlays.split(':'):
+      if not os.path.exists(path):

[sosa, 2010/11/12 21:28:40]

I guess this should also be isdir

[davidjames, 2010/11/12 21:37:50]

Done.

+        Die('Cannot find overlay: %s' % path)
+      overlays[path] = []
   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):
       Warning("Skipping %s" % overlay)
       continue
+
+    # TODO(davidjames): Currently, all code that interacts with git depends on
+    # the cwd being set to the overlay directory. We should instead pass in
+    # this parameter so that we don't need to modify the cwd globally.
     os.chdir(overlay)
 
     if command == 'clean':
       _Clean()
     elif command == 'push':
       _PushChange()
     elif command == 'commit' and ebuilds:
       work_branch = _GitBranch(_STABLE_BRANCH_NAME)
       work_branch.CreateBranch()
       if not work_branch.Exists():
@@ skipping 18 matching lines @@
           raise
 
       if revved_packages:
         _CleanStalePackages(gflags.FLAGS.board, revved_packages)
       else:
         work_branch.Delete()
 
 
 if __name__ == '__main__':
   main(sys.argv)