diff --git a/hb/__init__.py b/hb/__init__.py index 345a8f49b9b561ce06496b0587316d9ea0319b36..511901f8d60aa8b929498bc4b94658a96cbd110e 100755 --- a/hb/__init__.py +++ b/hb/__init__.py @@ -42,4 +42,4 @@ CONFIG_STRUCT = { "device_path": None, "patch_cache": None } -VERSION = '0.4.0' +VERSION = '0.4.1' diff --git a/hb/common/utils.py b/hb/common/utils.py index 029ef78308f4e7095850e2b05d61b93536bb8bff..5a7bed39db7885ef8398d53be7c74243515879a0 100755 --- a/hb/common/utils.py +++ b/hb/common/utils.py @@ -94,7 +94,7 @@ def exec_command(cmd, log_path='out/build.log', **kwargs): with open(log_path, 'at', encoding='utf-8') as log_file: process = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, + stderr=subprocess.STDOUT, encoding='utf-8', **kwargs) for line in iter(process.stdout.readline, ''): @@ -110,14 +110,6 @@ def exec_command(cmd, log_path='out/build.log', **kwargs): ret_code = process.returncode if ret_code != 0: - with open(log_path, 'at', encoding='utf-8') as log_file: - for line in iter(process.stderr.readline, ''): - if 'ninja: warning' in line: - log_file.write(line) - continue - hb_error(line) - log_file.write(line) - if is_log_filter: get_failed_log(log_path)