Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1677738 - Don't encode MOZ_UPDATE_CHANNEL in utf-8 on python 3. r=releng-reviewers,aki

Browse Source 
Otherwise, Windows builds with `update_channel` defined fail with
`TypeError: environment can only contain strings`.

Differential Revision: https://phabricator.services.mozilla.com/D97389
This commit is contained in:
Mike Hommey 2020-11-18 03:38:50 +00:00
parent 56346a0425
commit e0d3bfd380
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -673,7 +673,7 @@ items from that key's value."
# explicitly
if c.get("update_channel"):
update_channel = c["update_channel"]
if isinstance(update_channel, six.text_type):
if six.PY2 and isinstance(update_channel, six.text_type):
update_channel = update_channel.encode("utf-8")
env["MOZ_UPDATE_CHANNEL"] = update_channel
else: # let's just give the generic channel based on branch