Add support to pushing unstable changes for the chrome pfq.

bin/cbuildbot.py

Index: bin/cbuildbot.py
diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index c332a50aae97c84b00705d07f6ff167daac9f520..b5c4b8b15135fff0765a2616e1be76d9eed9e30a 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -416,7 +416,8 @@ def _Build(buildroot, emptytree):
 def _BuildChrome(buildroot, board, chrome_atom_to_build):
   """Wrapper for emerge call to build Chrome."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
-  RunCommand(['emerge-%s' % board, '=%s' % chrome_atom_to_build],
+  RunCommand(['ACCEPT_KEYWORDS="* ~*"', 'emerge-%s' % board,
+              '=%s' % chrome_atom_to_build],
              cwd=cwd, enter_chroot=True)
 
 
@@ -641,6 +642,8 @@ def main():
   # Parse options
   usage = "usage: %prog [options] cbuildbot_config"
   parser = optparse.OptionParser(usage=usage)
+  parser.add_option('-a', '--acl', default='private',
+                    help='ACL to set on GSD archives')
   parser.add_option('-r', '--buildroot',
                     help='root directory where build occurs', default=".")
   parser.add_option('-n', '--buildnumber',
@@ -649,30 +652,30 @@ def main():
                     dest='chrome_rev',
                     help=('Chrome_rev of type [tot|latest_release|'
                           'sticky_release]'))
-  parser.add_option('-f', '--revisionfile',
-                    help='file where new revisions are stored')
+  parser.add_option('-g', '--gsutil', default='', help='Location of gsutil')
+  parser.add_option('-c', '--gsutil_archive', default='',
+                    help='Datastore archive location')
   parser.add_option('--clobber', action='store_true', dest='clobber',
                     default=False,
                     help='Clobbers an old checkout before syncing')
   parser.add_option('--debug', action='store_true', dest='debug',
                     default=False,
                     help='Override some options to run as a developer.')
+  parser.add_option('--noprebuilts', action='store_false', dest='prebuilts',
+                    help="Don't upload prebuilts.")
   parser.add_option('--nosync', action='store_false', dest='sync',
                     default=True,
                     help="Don't sync before building.")
   parser.add_option('--notests', action='store_false', dest='tests',
                     default=True,
                     help='Override values from buildconfig and run no tests.')
+  parser.add_option('-f', '--revisionfile',
+                    help='file where new revisions are stored')
   parser.add_option('-t', '--tracking-branch', dest='tracking_branch',
                     default='cros/master', help='Run the buildbot on a branch')
   parser.add_option('-u', '--url', dest='url',
                     default='http://git.chromium.org/git/manifest',
                     help='Run the buildbot on internal manifest')
-  parser.add_option('-g', '--gsutil', default='', help='Location of gsutil')
-  parser.add_option('-c', '--gsutil_archive', default='',
-                    help='Datastore archive location')
-  parser.add_option('-a', '--acl', default='private',
-                    help='ACL to set on GSD archives')
 
   (options, args) = parser.parse_args()
 
@@ -731,6 +734,10 @@ def main():
     if options.chrome_rev:
       chrome_atom_to_build = _MarkChromeAsStable(buildroot, tracking_branch,
                                                  options.chrome_rev)
+      # 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)
@@ -768,7 +775,7 @@ def main():
       if buildconfig['master']:
         # Master bot needs to check if the other slaves completed.
         if cbuildbot_comm.HaveSlavesCompleted(config):
-          if not options.debug:
+          if not options.debug and options.prebuilts:
             _UploadPrebuilts(buildroot, board, buildconfig['rev_overlays'],
                              [new_binhost])
           _UprevPush(buildroot, tracking_branch, buildconfig['board'],