Skip to content

Commit e608c56

Browse files
authored
Fix to analyze gradle with only plugin input file (#244)
Signed-off-by: jiyeong.seok <[email protected]>
1 parent a98326d commit e608c56

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/fosslight_dependency/_package_manager.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def run_gradle_task(self):
108108
cmd_gradle = "./gradlew"
109109
else:
110110
ret_task = False
111-
logger.warning('No gradlew file exists. (skip to find dependencies relationship.')
111+
logger.warning('No gradlew file exists (Skip to find dependencies relationship.).')
112112
if ret_plugin:
113113
logger.warning('Also it cannot run android-dependency-scanning plugin.')
114114
if ret_task:
@@ -121,11 +121,10 @@ def run_gradle_task(self):
121121
self.parse_dependency_tree(ret)
122122
else:
123123
self.set_direct_dependencies(False)
124-
logger.warning("Failed to run allDeps task.")
124+
logger.warning(f"Fail to run {cmd}")
125125
except Exception as e:
126126
self.set_direct_dependencies(False)
127-
logger.error(f'Fail to run {cmd}: {e}')
128-
logger.warning('It cannot print the direct/transitive dependencies relationship.')
127+
logger.warning(f"Cannot print 'depends on' information. (fail {cmd}: {e})")
129128

130129
if ret_plugin:
131130
cmd = f"{cmd_gradle} generateLicenseTxt"
@@ -152,6 +151,9 @@ def run_gradle_task(self):
152151
if os.path.isfile(module_gradle_backup):
153152
os.remove(module_build_gradle)
154153
shutil.move(module_gradle_backup, module_build_gradle)
154+
if os.path.isfile(self.input_file_name):
155+
logger.info(f'Found {self.input_file_name}, skip to run plugin.')
156+
ret_task = True
155157
return ret_task
156158

157159
def add_android_plugin_in_gradle(self, module_build_gradle):

src/fosslight_dependency/package_manager/Pypi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def create_virtualenv(self):
111111
install_cmd = cmd_separator.join(install_cmd_list)
112112
else:
113113
logger.error(const.SUPPORT_PACKAE[self.package_manager_name])
114-
logger.error('Cannot create virtualenv becuase it cannot find: '
114+
logger.error('Cannot create virtualenv because it cannot find: '
115115
+ ', '.join(const.SUPPORT_PACKAE[self.package_manager_name]))
116116
logger.error("Please run with '-a' and '-d' option.")
117117
return False

0 commit comments

Comments
 (0)