Chromium Code Reviews| Index: tools/release/releases.py |
| diff --git a/tools/release/releases.py b/tools/release/releases.py |
| index 5b826fccba089d27afc2f0cab0fefc209ae033af..fd0cd3eb5fc5721a80be3c25f97aff1fa368963a 100755 |
| --- a/tools/release/releases.py |
| +++ b/tools/release/releases.py |
| @@ -460,13 +460,12 @@ class RetrieveInformationOnChromeReleases(Step): |
| chrome_releases = {"canaries": canaries} |
| self["chrome_releases"] = chrome_releases |
| - def _GetGitHashForV8Version(self, v8_version): |
| + def _ConvertToRealV8Version(self, v8_version): |
| if v8_version == "N/A": |
| return "" |
| if v8_version.split(".")[3]== "0": |
| - return self.GitGetHashOfTag(v8_version[:-2]) |
| - |
| - return self.GitGetHashOfTag(v8_version) |
| + return v8_version[:-2] |
| + return v8_version |
| def _CreateCandidate(self, current_version): |
| params = None |
| @@ -477,11 +476,17 @@ class RetrieveInformationOnChromeReleases(Step): |
| params, |
| wait_plan=[5, 20] |
| ) |
| - previous_v8_version = json.loads(result_raw)["v8_version"] |
| - v8_previous_version_hash = self._GetGitHashForV8Version(previous_v8_version) |
| - |
| - current_v8_version = current_version["v8_version"] |
| - v8_version_hash = self._GetGitHashForV8Version(current_v8_version) |
| + previous_v8_version = ( |
| + self._ConvertToRealV8Version(json.loads(result_raw)["v8_version"])) |
|
Michael Achenbach
2015/04/28 20:48:49
nit: 4 spaces after round parenthesis or better:
p
|
| + v8_previous_version_hash = "" |
| + if previous_v8_version != "": |
| + v8_previous_version_hash = self.GitGetHashOfTag(previous_v8_version) |
| + |
| + current_v8_version = ( |
| + self._ConvertToRealV8Version(current_version["v8_version"])) |
| + v8_version_hash = "" |
| + if current_v8_version != "": |
| + v8_version_hash = self.GitGetHashOfTag(current_v8_version) |
| current_candidate = { |
| "chrome_version": current_version["version"], |