EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix compatibility with python 3.6

Browse Source 
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>
This commit is contained in:
Huangbin Zhan 2020-07-07 07:14:42 +08:00 committed by Petr Štetiar
parent ab26022cc1
commit 3caad5150c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/json_overview_image_info.py
View File

@ -2,7 +2,7 @@
from os import getenv, environ from os import getenv, environ
from pathlib import Path from pathlib import Path
from subprocess import run from subprocess import run, PIPE
from sys import argv from sys import argv
import json import json
@ -42,10 +42,11 @@ if output:
"val.DEFAULT_PACKAGES", "val.DEFAULT_PACKAGES",
"val.ARCH_PACKAGES", "val.ARCH_PACKAGES",
], ],
capture_output=True, stdout=PIPE,
stderr=PIPE,
check=True, check=True,
env=environ.copy().update({"TOPDIR": Path().cwd()}), env=environ.copy().update({"TOPDIR": Path().cwd()}),
text=True, universal_newlines=True,
).stdout.splitlines() ).stdout.splitlines()
output["default_packages"] = default_packages.split() output["default_packages"] = default_packages.split()