Bug 1339523 - Merge day script's bump_second_digit() should bump 52.0 to 52.1.0 not 52.1 r=jlorenzo a=release DONTBUILD
MozReview-Commit-ID: 1WC3Zvds5xg
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -448,20 +448,19 @@ class GeckoMigration(MercurialScript, Ba
ESR need only the second digit bumped as a part of merge day."""
dirs = self.query_abs_dirs()
version = self.get_version(dirs['abs_to_dir'])
curr_version = ".".join(version)
next_version = list(version)
# bump the second digit
next_version[1] = str(int(next_version[1]) + 1)
- # in case we have third digit, reset it to 0
- if len(next_version) > 2:
- next_version[2] = '0'
- next_version = ".".join(next_version)
+ # Take major+minor and append '0' accordng to Firefox version schema.
+ # 52.0 will become 52.1.0, not 52.1
+ next_version = ".".join(next_version[:2] + ['0'])
for f in self.config["version_files"]:
self.replace(os.path.join(dirs['abs_to_dir'], f["file"]),
curr_version, next_version + f["suffix"])
self.touch_clobber_file(dirs['abs_to_dir'])
def pull(self):
""" Pull tools first, then clone the gecko repos
"""