Fix discovering of stable candidate with unstable ebuilds.

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 83 matching lines @@
   Returns:
     Latest version string.
   """
   buildspec_url = 'http://src.chromium.org/svn/releases'
   svn_ls = RunCommand(['svn', 'ls', buildspec_url], redirect_stdout=True)
   sorted_ls = RunCommand(['sort', '--version-sort'], input=svn_ls,
                          redirect_stdout=True)
   if branch:
     chrome_version_re = re.compile('^%s\.\d+.*' % branch)
   else:
-    chrome_version_re = re.compile('^[0-9]\..*')
+    chrome_version_re = re.compile('^[0-9]+\..*')
   for chrome_version in sorted_ls.splitlines():
     if chrome_version_re.match(chrome_version):
       current_version = chrome_version
 
   return current_version.rstrip('/')
 
 
 def _GetStickyEBuild(stable_ebuilds):
   """Returns the sticky ebuild."""
   sticky_ebuilds = []
@@ skipping 24 matching lines @@
 
   def __cmp__(self, other):
     """Use ebuild paths for comparison."""
     if self.ebuild_path == other.ebuild_path:
       return 0
     elif self.ebuild_path > other.ebuild_path:
       return 1
     else:
       return (-1)
 
+  def __str__(self):
+    return self.ebuild_path
+
 
 def FindChromeCandidates(overlay_dir):
   """Return a tuple of chrome's unstable ebuild and stable ebuilds.
 
   Args:
     overlay_dir: The path to chrome's portage overlay dir.
   Returns:
     Tuple [unstable_ebuild, stable_ebuilds].
   Raises:
     Exception: if no unstable ebuild exists for Chrome.
   """
   stable_ebuilds = []
   unstable_ebuilds = []
   for path in [
       os.path.join(overlay_dir, entry) for entry in os.listdir(overlay_dir)]:
     if path.endswith('.ebuild'):
       ebuild = ChromeEBuild(path)
       if not ebuild.chrome_version:
         Warning('Poorly formatted ebuild found at %s' % path)
       else:
-        if not ebuild.is_stable:
+        if '9999' in ebuild.version:
           unstable_ebuilds.append(ebuild)
         else:
           stable_ebuilds.append(ebuild)
 
   # Apply some sanity checks.
   if not unstable_ebuilds:
     raise Exception('Missing 9999 ebuild for %s' % overlay_dir)
   if not stable_ebuilds:
     Warning('Missing stable ebuild for %s' % overlay_dir)
 
@@ skipping 85 matching lines @@
       unstable_ebuild.ebuild_path, new_ebuild_path, 'CROS_SVN_COMMIT', commit,
       make_stable=False)
   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.')
       os.unlink(new_ebuild_path)
       return None
 
   RunCommand(['git', 'add', new_ebuild_path])
   if stable_candidate and stable_candidate != sticky_ebuild:
     RunCommand(['git', 'rm', stable_candidate.ebuild_path])
 
   cros_mark_as_stable.EBuildStableMarker.CommitChange(
       _GIT_COMMIT_MESSAGE % {'chrome_rev': chrome_rev,
                              'chrome_version': chrome_version})
@@ skipping 50 matching lines @@
       print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom
     else:
       work_branch.Delete()
   except:
     work_branch.Delete()
     raise
 
 
 if __name__ == '__main__':
   main()