Have the ability for the PFQ to both rev Chrome and other packages.

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 717 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)
 
     if not os.path.isdir(boardpath):
       _SetupBoard(buildroot, board=buildconfig['board'])
 
-    # 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)
-      # If we found nothing to rev, we're done here.
-      if not chrome_atom_to_build:
-        return
-
-    elif buildconfig['uprev']:
+    # Perform chrome uprev.
+    chrome_atom_to_build = _MarkChromeAsStable(buildroot, tracking_branch,
+                                               options.chrome_rev, board)
+    # Perform other uprevs.
+    if buildconfig['uprev']:
       _UprevPackages(buildroot, tracking_branch, revisionfile,
                      buildconfig['board'], rev_overlays)
+    elif not chrome_atom_to_ebuild:
+      # We found nothing to rev, we're done here.
+      return
 
     _EnableLocalAccount(buildroot)
 
     if options.build:
       _Build(buildroot, emptytree)
 
       if buildconfig['unittests'] and options.tests:
         _RunUnitTests(buildroot)
 
       _BuildImage(buildroot)
@@ skipping 40 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()