Change logic to auto-rev for latest_release and sticky branch.

bin/cros_mark_chrome_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 Chrome for cbuildbot.
 
 After calling, it prints outs CHROME_VERSION_ATOM=(version atom string).  A
 caller could then use this atom with emerge to build the newly uprevved version
@@ skipping 246 matching lines @@
         stable_candidate.ebuild_path_no_revision,
         stable_candidate.current_revision + 1)
   else:
     if chrome_rev == TIP_OF_TRUNK:
       portage_suffix = '_alpha'
     else:
       portage_suffix = '_rc'
 
     new_ebuild_path = base_path + ('%s-r1.ebuild' % portage_suffix)
 
+  # Mark latest release and sticky branches as stable.
+  mark_stable = chrome_rev != TIP_OF_TRUNK
+
   cros_mark_as_stable.EBuildStableMarker.MarkAsStable(
       unstable_ebuild.ebuild_path, new_ebuild_path, 'CROS_SVN_COMMIT', commit,
-      make_stable=False)
+      make_stable=mark_stable)
   new_ebuild = ChromeEBuild(new_ebuild_path)
   if stable_candidate and (
       stable_candidate.chrome_version == new_ebuild.chrome_version):
     if 0 == RunCommand(['diff', '-Bu', stable_candidate.ebuild_path,
                         new_ebuild_path],
                        redirect_stderr=True,
                        redirect_stdout=True,
                        exit_code=True):
       Info('Previous ebuild with same version found and no 9999 changes found.'
            '  Nothing to do.')
@@ skipping 34 matching lines @@
   (unstable_ebuild, stable_ebuilds) = FindChromeCandidates(overlay_dir)
   sticky_ebuild = _GetStickyEBuild(stable_ebuilds)
   sticky_version = sticky_ebuild.chrome_version
   sticky_branch = sticky_version.rpartition('.')[0]
 
   if chrome_rev == TIP_OF_TRUNK:
     version_to_uprev = _GetTipOfTrunkVersion()
     commit_to_use = _GetTipOfTrunkSvnRevision()
   elif chrome_rev == LATEST_RELEASE:
     version_to_uprev = _GetLatestRelease()
+    # Don't rev on stable branch for latest_release.
+    if re.match('%s\.\d+' % sticky_branch, version_to_uprev):
+      Info('Latest release is sticky branch.  Nothing to do.')
+      return
   else:
     version_to_uprev = _GetLatestRelease(sticky_branch)
 
   stable_candidate = FindChromeUprevCandidate(stable_ebuilds, chrome_rev,
                                               sticky_branch)
 
+  if stable_candidate:
+    Info('Stable candidate found %s' % stable_candidate)
+  else:
+    Info('No stable candidate found.')
+
   os.chdir(overlay_dir)
   work_branch = cros_mark_as_stable.GitBranch(
       cros_mark_as_stable.STABLE_BRANCH_NAME, options.tracking_branch)
   work_branch.CreateBranch()
   try:
     chrome_version_atom = MarkChromeEBuildAsStable(
         stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,
         commit_to_use, overlay_dir, sticky_ebuild)
     # Explicit print to communicate to caller.
     if chrome_version_atom:
       print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom
     else:
       work_branch.Delete()
   except:
     work_branch.Delete()
     raise
 
 
 if __name__ == '__main__':
   main()