build: fix python util verbose mode logic (#44431)

build: fix verbose mode logic
This commit is contained in:
Shelley Vohr 2024-10-29 16:35:57 +01:00 committed by GitHub
parent 53458da01e
commit 9fc94a162b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 46 additions and 25 deletions

View file

@ -28,16 +28,17 @@ def get_target_arch():
return 'x64'
return arch
def enable_verbose_mode():
def set_verbose_mode(mode):
print('Running in verbose mode')
global verbose_mode
verbose_mode = True
verbose_mode = mode
def is_verbose_mode():
return verbose_mode
def verbose_mode_print(output):
if verbose_mode:
print(output)
def get_zip_name(name, version, suffix=''):
arch = get_target_arch()

View file

@ -11,9 +11,7 @@ import sys
from urllib.request import urlopen
import zipfile
# from lib.config import is_verbose_mode
def is_verbose_mode():
return False
from lib.config import verbose_mode_print
ELECTRON_DIR = os.path.abspath(
os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
@ -112,13 +110,11 @@ def safe_mkdir(path):
def execute(argv, env=None, cwd=None):
if env is None:
env = os.environ
if is_verbose_mode():
print(' '.join(argv))
verbose_mode_print(' '.join(argv))
try:
output = subprocess.check_output(argv, stderr=subprocess.STDOUT,
env=env, cwd=cwd)
if is_verbose_mode():
print(output)
verbose_mode_print(output.decode('utf-8').strip())
return output
except subprocess.CalledProcessError as e:
print(e.output)