Bug 1255273 - Partial mar files have two channel IDs r=nthomas draft
authorRail Aliiev <rail@mozilla.com>
Wed, 09 Mar 2016 23:20:22 -0500
changeset 338907 2d98bc9127ce0dafaa13225a5ad1d9dfca9fb5c3
parent 338906 504e0b786d3895203af3f67923bf5f6a76ac05a7
child 515878 d28ffa2b68f5c7bb76a1ff42de15d646c565b991
push id12602
push userbmo:rail@mozilla.com
push dateThu, 10 Mar 2016 04:20:46 +0000
reviewersnthomas
bugs1255273
milestone48.0a1
Bug 1255273 - Partial mar files have two channel IDs r=nthomas 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
@@ -225,16 +225,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",