gistfile.diff

commit fd1aac604a558a4d35f4cb4142133606622a2296
Author: Rail Aliiev <rail@mozilla.com>
Date:   Tue Jan 19 16:38:52 2016 -0500

    Fix eet

diff --git a/testing/mozharness/configs/merge_day/aurora_to_beta.py b/testing/mozharness/configs/merge_day/aurora_to_beta.py
index 24bfd07..c0800ea 100644
--- a/testing/mozharness/configs/merge_day/aurora_to_beta.py
+++ b/testing/mozharness/configs/merge_day/aurora_to_beta.py
@@ -1,10 +1,9 @@
 config = {
     "log_name": "aurora_to_beta",
     "version_files": [
-        {"file": "browser/config/version.txt"},
+        {"file": "browser/config/version.txt", "suffix": ""},
         {"file": "browser/config/version_display.txt", "suffix": "b1"},
-        {"file": "config/milestone.txt"},
-        {"file": "b2g/confvars.sh"},
+        {"file": "config/milestone.txt", "suffix": ""},
     ],
     "replacements": [
         # File, from, to
diff --git a/testing/mozharness/configs/merge_day/beta_to_release.py b/testing/mozharness/configs/merge_day/beta_to_release.py
index 0a86d98..cbc45cf 100644
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -1,10 +1,9 @@
 config = {
     "log_name": "beta_to_release",
     "version_files": [
-        {"file": "browser/config/version.txt"},
-        {"file": "browser/config/version_display.txt"},
-        {"file": "config/milestone.txt"},
-        {"file": "b2g/confvars.sh"},
+        {"file": "browser/config/version.txt", "suffix": ""},
+        {"file": "browser/config/version_display.txt", "suffix": ""},
+        {"file": "config/milestone.txt", "suffix": ""},
     ],
     "replacements": [
         # File, from, to
diff --git a/testing/mozharness/configs/merge_day/bump_esr.py b/testing/mozharness/configs/merge_day/bump_esr.py
index 4b9ed65..be51ca7 100644
--- a/testing/mozharness/configs/merge_day/bump_esr.py
+++ b/testing/mozharness/configs/merge_day/bump_esr.py
@@ -1,10 +1,10 @@
 config = {
     "log_name": "bump_esr",
     "version_files": [
-        {"file": "browser/config/version.txt"},
+        {"file": "browser/config/version.txt", "suffix": ""},
         # TODO: add the following line when ESR is 45
-        # {"file": "browser/config/version_display.txt"},
-        {"file": "config/milestone.txt"},
+        # {"file": "browser/config/version_display.txt", "suffix": ""},
+        {"file": "config/milestone.txt", "suffix": ""},
     ],
     "tools_repo_url": "https://hg.mozilla.org/build/tools",
     "tools_repo_revision": "default",
diff --git a/testing/mozharness/configs/merge_day/central_to_aurora.py b/testing/mozharness/configs/merge_day/central_to_aurora.py
index 0861a91..4e99037 100644
--- a/testing/mozharness/configs/merge_day/central_to_aurora.py
+++ b/testing/mozharness/configs/merge_day/central_to_aurora.py
@@ -1,10 +1,9 @@
 config = {
     "log_name": "central_to_aurora",
     "version_files": [
-        {"file": "browser/config/version.txt"},
-        {"file": "browser/config/version_display.txt"},
-        {"file": "config/milestone.txt"},
-        {"file": "b2g/confvars.sh"},
+        {"file": "browser/config/version.txt", "suffix": ""},
+        {"file": "browser/config/version_display.txt", "suffix": ""},
+        {"file": "config/milestone.txt", "suffix": ""},
     ],
     "replacements": [
         # File, from, to
diff --git a/testing/mozharness/configs/merge_day/release_to_esr.py b/testing/mozharness/configs/merge_day/release_to_esr.py
index c8cd8a7..0b6a6df 100644
--- a/testing/mozharness/configs/merge_day/release_to_esr.py
+++ b/testing/mozharness/configs/merge_day/release_to_esr.py
@@ -5,10 +5,9 @@ OLD_ESR_CHANGESET = "16351963d75c"
 config = {
     "log_name": "relese_to_esr",
     "version_files": [
-        {"file": "browser/config/version.txt"},
-        {"file": "browser/config/version_display.txt"},
-        {"file": "config/milestone.txt"},
-        {"file": "b2g/confvars.sh"},
+        {"file": "browser/config/version.txt", "suffix": ""},
+        {"file": "browser/config/version_display.txt", "suffix": ""},
+        {"file": "config/milestone.txt", "suffix": ""},
     ],
     "replacements": [
         # File, from, to
diff --git a/testing/mozharness/scripts/merge_day/gecko_migration.py b/testing/mozharness/scripts/merge_day/gecko_migration.py
index 02794f7a..be59201 100755
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -334,9 +334,7 @@ class GeckoMigration(MercurialScript, BalrogMixin, VirtualenvMixin, SelfServeMix
         next_weave_version = str(int(curr_weave_version) + 1)
         for f in self.config["version_files"]:
             from_ = "%s.0%s" % (curr_version, curr_suffix)
-            to = "%s.0%s" % (next_version, next_suffix)
-            if f.get("suffix"):
-                to += f["suffix"]
+            to = "%s.0%s%s" % (next_version, next_suffix, f["suffix"])
             self.replace(os.path.join(cwd, f["file"]), from_, to)
 
         # only applicable for m-c
@@ -490,11 +488,8 @@ class GeckoMigration(MercurialScript, BalrogMixin, VirtualenvMixin, SelfServeMix
             next_version[2] = '0'
         next_version = ".".join(next_version)
         for f in self.config["version_files"]:
-            to = next_version
-            if f.get("suffix"):
-                to += f["suffix"]
             self.replace(os.path.join(dirs['abs_to_dir'], f["file"]),
-                         curr_version, next_version)
+                         curr_version, next_version + f["suffix"])
         self.touch_clobber_file(dirs['abs_to_dir'])
 
 # Actions {{{1