From 223f41f35b88bbef6eced8513a30a4aae375129a Mon Sep 17 00:00:00 2001 From: "jiyeong.seok" Date: Wed, 23 Apr 2025 10:47:19 +0900 Subject: [PATCH] Fix to detect pypi install error Signed-off-by: jiyeong.seok --- src/fosslight_dependency/package_manager/Pypi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fosslight_dependency/package_manager/Pypi.py b/src/fosslight_dependency/package_manager/Pypi.py index 4de61c44..aaf943ea 100644 --- a/src/fosslight_dependency/package_manager/Pypi.py +++ b/src/fosslight_dependency/package_manager/Pypi.py @@ -129,7 +129,7 @@ def create_virtualenv(self): if cmd_ret.returncode != 0: ret = False err_msg = f"return code({cmd_ret.returncode})" - elif cmd_ret.stderr.decode('utf-8').rstrip().startswith('ERROR:'): + elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'): ret = False err_msg = f"stderr msg({cmd_ret.stderr})" except Exception as e: @@ -137,7 +137,7 @@ def create_virtualenv(self): err_msg = e finally: try: - if self.platform != const.WINDOWS: + if (not ret) and (self.platform != const.WINDOWS): ret = True create_venv_cmd = f"virtualenv -p python3 {self.venv_tmp_dir}" @@ -147,14 +147,14 @@ def create_virtualenv(self): if cmd_ret.returncode != 0: ret = False err_msg = f"return code({cmd_ret.returncode})" - elif cmd_ret.stderr.decode('utf-8').rstrip().startswith('ERROR:'): + elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'): ret = False err_msg = f"stderr msg({cmd_ret.stderr})" except Exception as e: ret = False err_msg = e if ret: - logger.info(f"It created the temporary virtualenv({venv_path}).") + logger.info(f"Created the temporary virtualenv({venv_path}).") else: logger.error(f"Failed to create virtualenv: {err_msg}")