Skip to content

Commit 67e8920

Browse files
authored
Fix to detect pypi install error (#252)
Signed-off-by: jiyeong.seok <[email protected]>
1 parent 2b3147b commit 67e8920

File tree

1 file changed

+4
-4
lines changed
  • src/fosslight_dependency/package_manager

1 file changed

+4
-4
lines changed

src/fosslight_dependency/package_manager/Pypi.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ def create_virtualenv(self):
129129
if cmd_ret.returncode != 0:
130130
ret = False
131131
err_msg = f"return code({cmd_ret.returncode})"
132-
elif cmd_ret.stderr.decode('utf-8').rstrip().startswith('ERROR:'):
132+
elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'):
133133
ret = False
134134
err_msg = f"stderr msg({cmd_ret.stderr})"
135135
except Exception as e:
136136
ret = False
137137
err_msg = e
138138
finally:
139139
try:
140-
if self.platform != const.WINDOWS:
140+
if (not ret) and (self.platform != const.WINDOWS):
141141
ret = True
142142
create_venv_cmd = f"virtualenv -p python3 {self.venv_tmp_dir}"
143143

@@ -147,14 +147,14 @@ def create_virtualenv(self):
147147
if cmd_ret.returncode != 0:
148148
ret = False
149149
err_msg = f"return code({cmd_ret.returncode})"
150-
elif cmd_ret.stderr.decode('utf-8').rstrip().startswith('ERROR:'):
150+
elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'):
151151
ret = False
152152
err_msg = f"stderr msg({cmd_ret.stderr})"
153153
except Exception as e:
154154
ret = False
155155
err_msg = e
156156
if ret:
157-
logger.info(f"It created the temporary virtualenv({venv_path}).")
157+
logger.info(f"Created the temporary virtualenv({venv_path}).")
158158
else:
159159
logger.error(f"Failed to create virtualenv: {err_msg}")
160160

0 commit comments

Comments
 (0)