From f0530ff8289298f04296f82f3091d4e8bb023542 Mon Sep 17 00:00:00 2001 From: chen524 Date: Tue, 30 Jan 2024 01:35:28 +0000 Subject: [PATCH] update src/oebuild/util.py. Signed-off-by: chen524 --- src/oebuild/util.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/oebuild/util.py b/src/oebuild/util.py index 576bf7d..4a48f57 100644 --- a/src/oebuild/util.py +++ b/src/oebuild/util.py @@ -246,17 +246,12 @@ def get_host_proxy(proxy_name): return host_proxy for name in proxy_name: - command = "env | grep %s | awk -F'=' '{print$NF}'" % name - res = subprocess.run(command, - shell=True, - capture_output=True, - encoding="utf-8", - check=False) - if res.returncode != 0: - logger.error("get proxy variable failed") - sys.exit(res.returncode) - value = res.stdout.strip() - if value != "": + command = f"env | grep {name} | awk -F'=' '{{print$NF}}'" + try: + value = subprocess.check_output(command, shell=True, encoding="utf-8").strip() host_proxy[name] = value + except subprocess.CalledProcessError as e: + logger.error("get proxy variable failed") + sys.exit(e.returncode) return host_proxy -- Gitee