Bug 1255273 - Partial mar files have two channel IDs r=nthomas a=release FIREFOX_47_0b1_BUILD2 FIREFOX_47_0b1_RELEASE
authorRail Aliiev <rail@mozilla.com>
Wed, 09 Mar 2016 23:20:22 -0500
changeset 357590 5bbf2e7c2fc6ff9010b1948e2f11477f48ee36e2
parent 357589 dcaf0a6fa115ad73bf7505a8e76464250b971a04
child 357591 e0cddb21b2849605a49f8ace1b786e0dd04ef4ce
push id16807
push usermleibovic@mozilla.com
push dateFri, 29 Apr 2016 00:55:34 +0000
reviewersnthomas, release
bugs1255273
milestone47.0
Bug 1255273 - Partial mar files have two channel IDs r=nthomas a=release MozReview-Commit-ID: 3Nv38vsoOvr
release/docker/funsize-update-generator/scripts/funsize.py
--- a/release/docker/funsize-update-generator/scripts/funsize.py
+++ b/release/docker/funsize-update-generator/scripts/funsize.py
@@ -233,16 +233,19 @@ def main():
                                option="SourceRepository"),
             "revision": get_option(path, filename="platform.ini",
                                    section="Build", option="SourceStamp"),
             "from_mar": e["from_mar"],
             "to_mar": e["to_mar"],
             "platform": e["platform"],
             "locale": e["locale"],
         }
+        # Override ACCEPTED_MAR_CHANNEL_IDS if needed
+        if "ACCEPTED_MAR_CHANNEL_IDS" in os.environ:
+            mar_data["ACCEPTED_MAR_CHANNEL_IDS"] = os.environ["ACCEPTED_MAR_CHANNEL_IDS"]
         for field in ("update_number", "previousVersion",
                       "previousBuildNumber", "toVersion",
                       "toBuildNumber"):
             if field in e:
                 mar_data[field] = e[field]
         mar_data.update(complete_mars)
         # if branch not set explicitly use repo-name
         mar_data["branch"] = e.get("branch",