Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(839)

Unified Diff: bin/cros_mark_chrome_as_stable.py

Issue 5884004: Fix discovering of stable candidate with unstable ebuilds. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/cros_mark_chrome_as_stable.py
diff --git a/bin/cros_mark_chrome_as_stable.py b/bin/cros_mark_chrome_as_stable.py
index 23655500f9bab2cce4a5b4850eff27b54e2e3ed0..d90eec4c50359144170a1c1d0d8a1d41aff63bb8 100755
--- a/bin/cros_mark_chrome_as_stable.py
+++ b/bin/cros_mark_chrome_as_stable.py
@@ -146,6 +146,9 @@ class ChromeEBuild(cros_mark_as_stable.EBuild):
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.
@@ -166,7 +169,7 @@ def FindChromeCandidates(overlay_dir):
if not ebuild.chrome_version:
Warning('Poorly formatted ebuild found at %s' % path)
else:
- if not ebuild.is_stable:
+ if '9999' in ebuild.version:
sosa 2010/12/16 19:11:34 Since we're commiting unstable ebuilds until we ha
unstable_ebuilds.append(ebuild)
else:
stable_ebuilds.append(ebuild)
@@ -272,6 +275,8 @@ def MarkChromeEBuildAsStable(stable_candidate, unstable_ebuild, chrome_rev,
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698