From 97e7eee7900a4636662c3fe15a417895f8214b08 Mon Sep 17 00:00:00 2001 From: Mike Shal Date: Tue, 10 Mar 2020 20:19:24 +0000 Subject: [PATCH] Bug 1620744 - Convert variables.py:source_repo_header() to py3; r=firefox-build-system-reviewers,rstewart Differential Revision: https://phabricator.services.mozilla.com/D65850 --HG-- extra : moz-landing-system : lando --- build/variables.py | 3 ++- moz.build | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/variables.py b/build/variables.py index 86dfe508295e..01ae2f0d8bc2 100644 --- a/build/variables.py +++ b/build/variables.py @@ -25,7 +25,8 @@ def buildid_header(output): def get_program_output(*command): try: with open(os.devnull) as stderr: - return subprocess.check_output(command, stderr=stderr) + return subprocess.check_output(command, stderr=stderr, + universal_newlines=True) except Exception: return '' diff --git a/moz.build b/moz.build index e4aab1d84c6c..76fa51a8bfb5 100644 --- a/moz.build +++ b/moz.build @@ -164,7 +164,6 @@ if not CONFIG['JS_STANDALONE'] or not CONFIG['MOZ_BUILD_APP']: GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header' GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header' - GENERATED_FILES['source-repo.h'].py2 = True DIRS += [ 'build',