Revert "Have the ability for the PFQ to both rev Chrome and ..."

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 heapq
@@ skipping 308 matching lines @@
 
 
 def _IncrementalCheckout(buildroot, retries=_DEFAULT_RETRIES):
   """Performs a checkout without clobbering previous checkout."""
   RepoSync(buildroot, retries)
 
 
 def _MakeChroot(buildroot, replace=False):
   """Wrapper around make_chroot."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
-
+  
   cmd = ['./make_chroot', '--fast']
-
+  
   if replace:
     cmd.append('--replace')
-
+  
   RunCommand(cmd, cwd=cwd)
 
 
 def _GetPortageEnvVar(buildroot, board, envvar):
   """Get a portage environment variable for the specified board, if any.
 
   buildroot: The root directory where the build occurs. Must be an absolute
              path.
   board: Board type that was built on this machine. E.g. x86-generic. If this
          is None, get the env var from the host.
@@ skipping 22 matching lines @@
 def _Build(buildroot, emptytree, build_autotest=True, usepkg=True):
   """Wrapper around build_packages."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   if emptytree:
     cmd = ['sh', '-c', 'EXTRA_BOARD_FLAGS=--emptytree ./build_packages']
   else:
     cmd = ['./build_packages']
 
   if not build_autotest:
     cmd.append('--nowithautotest')
-
+  
   if not usepkg:
     cmd.append('--nousepkg')
 
   RunCommand(cmd, cwd=cwd, enter_chroot=True)
 
 
 def _EnableLocalAccount(buildroot):
   cwd = os.path.join(buildroot, 'src', 'scripts')
   # Set local account for test images.
   RunCommand(['./enable_localaccount.sh',
@@ skipping 343 matching lines @@
     for path in rev_overlays:
       if not os.path.isdir(path):
         Die('Missing overlay: %s' % path)
 
     if not os.path.isdir(chroot_path):
       _MakeChroot(buildroot, buildconfig['chroot_replace'])
 
     if not os.path.isdir(boardpath):
       _SetupBoard(buildroot, board=buildconfig['board'])
 
-    # Perform chrome uprev.
+    # Perform uprev.  If chrome_uprev is set, rev Chrome ebuilds.
     if options.chrome_rev:
       chrome_atom_to_build = _MarkChromeAsStable(buildroot, tracking_branch,
                                                  options.chrome_rev, board)
-    # Perform other uprevs.
-    if buildconfig['uprev']:
+      # If we found nothing to rev, we're done here.
+      if not chrome_atom_to_build:
+        return
+
+    elif buildconfig['uprev']:
       _UprevPackages(buildroot, tracking_branch, revisionfile,
                      buildconfig['board'], rev_overlays)
-    elif not chrome_atom_to_build:
-      # We found nothing to rev, we're done here.
-      return
 
     _EnableLocalAccount(buildroot)
 
     if options.build:
       _Build(buildroot,
              emptytree,
              build_autotest=(buildconfig['vm_tests'] and options.tests),
              usepkg=buildconfig['usepkg'])
 
       if buildconfig['unittests'] and options.tests:
@@ skipping 43 matching lines @@
   except:
     # 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()