aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuangbin Zhan <zhanhb88@gmail.com>2020-07-07 07:14:42 +0800
committerPetr Štetiar <ynezz@true.cz>2020-07-07 19:47:24 +0200
commit3caad5150c2011a7dac462acaa06d0e69f8ed005 (patch)
tree3efe056bc67384bfc03080b58e2461c1e7df73a3
parentab26022cc104a2dd82b7bb7e6468f693b68e75ed (diff)
downloadupstream-3caad5150c2011a7dac462acaa06d0e69f8ed005.tar.gz
upstream-3caad5150c2011a7dac462acaa06d0e69f8ed005.tar.bz2
upstream-3caad5150c2011a7dac462acaa06d0e69f8ed005.zip
build: fix compatibility with python 3.6
On a system python3 is linked to python3.6, fail to perform json_overview_image_info and got `TypeError: __init__() got an unexpected keyword argument 'capture_output'`. This patch emulate the behaviour on python 3.7+. Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
-rwxr-xr-xscripts/json_overview_image_info.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index 8f3525f890..c76a442840 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -2,7 +2,7 @@
from os import getenv, environ
from pathlib import Path
-from subprocess import run
+from subprocess import run, PIPE
from sys import argv
import json
@@ -42,10 +42,11 @@ if output:
"val.DEFAULT_PACKAGES",
"val.ARCH_PACKAGES",
],
- capture_output=True,
+ stdout=PIPE,
+ stderr=PIPE,
check=True,
env=environ.copy().update({"TOPDIR": Path().cwd()}),
- text=True,
+ universal_newlines=True,
).stdout.splitlines()
output["default_packages"] = default_packages.split()