Skip to content

Commit 58fc551

Browse files
authored
Fix bug about mvnw cmd (#253)
Signed-off-by: jiyeong.seok <[email protected]>
1 parent 7f80495 commit 58fc551

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/fosslight_dependency/_package_manager.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,12 @@ def check_license_name(license_txt, is_filepath=False):
354354

355355

356356
def change_file_mode(filepath, mode=''):
357-
current_mode = os.stat(filepath).st_mode
357+
current_mode = ''
358358

359359
if not os.path.exists(filepath):
360360
logger.debug(f"The file{filepath} does not exist.")
361361
else:
362+
current_mode = os.stat(filepath).st_mode
362363
if not mode:
363364
new_mode = current_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
364365
else:

src/fosslight_dependency/package_manager/Maven.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,17 @@ def clean_run_maven_plugin_output(self):
134134

135135
def run_maven_plugin(self):
136136
logger.info('Run maven license scanning plugin with temporary pom.xml')
137+
current_mode = ''
137138
if os.path.isfile('mvnw') or os.path.isfile('mvnw.cmd'):
138139
if self.platform == const.WINDOWS:
139140
cmd_mvn = "mvnw.cmd"
140141
else:
141142
cmd_mvn = "./mvnw"
143+
current_mode = change_file_mode(cmd_mvn)
142144
else:
143145
cmd_mvn = "mvn"
144146
cmd = f"{cmd_mvn} license:aggregate-download-licenses"
145-
current_mode = change_file_mode(cmd_mvn)
147+
146148
ret = subprocess.call(cmd, shell=True)
147149
if ret != 0:
148150
logger.error(f"Failed to run maven plugin: {cmd}")
@@ -159,7 +161,8 @@ def run_maven_plugin(self):
159161
except Exception as e:
160162
logger.error(f"Failed to run '{cmd}': {e}")
161163
self.set_direct_dependencies(False)
162-
change_file_mode(cmd_mvn, current_mode)
164+
if current_mode:
165+
change_file_mode(cmd_mvn, current_mode)
163166

164167
def create_dep_stack(self, dep_line):
165168
dep_stack = []

0 commit comments

Comments
 (0)