Skip to content

Fix to analyze gradle with only plugin input file #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 24, 2025
Merged

Fix to analyze gradle with only plugin input file #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/fosslight_dependency/_package_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def run_gradle_task(self):
cmd_gradle = "./gradlew"
else:
ret_task = False
logger.warning('No gradlew file exists. (skip to find dependencies relationship.')
logger.warning('No gradlew file exists (Skip to find dependencies relationship.).')
if ret_plugin:
logger.warning('Also it cannot run android-dependency-scanning plugin.')
if ret_task:
Expand All @@ -121,11 +121,10 @@ def run_gradle_task(self):
self.parse_dependency_tree(ret)
else:
self.set_direct_dependencies(False)
logger.warning("Failed to run allDeps task.")
logger.warning(f"Fail to run {cmd}")
except Exception as e:
self.set_direct_dependencies(False)
logger.error(f'Fail to run {cmd}: {e}')
logger.warning('It cannot print the direct/transitive dependencies relationship.')
logger.warning(f"Cannot print 'depends on' information. (fail {cmd}: {e})")

if ret_plugin:
cmd = f"{cmd_gradle} generateLicenseTxt"
Expand All @@ -152,6 +151,9 @@ def run_gradle_task(self):
if os.path.isfile(module_gradle_backup):
os.remove(module_build_gradle)
shutil.move(module_gradle_backup, module_build_gradle)
if os.path.isfile(self.input_file_name):
logger.info(f'Found {self.input_file_name}, skip to run plugin.')
ret_task = True
return ret_task

def add_android_plugin_in_gradle(self, module_build_gradle):
Expand Down
2 changes: 1 addition & 1 deletion src/fosslight_dependency/package_manager/Pypi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def create_virtualenv(self):
install_cmd = cmd_separator.join(install_cmd_list)
else:
logger.error(const.SUPPORT_PACKAE[self.package_manager_name])
logger.error('Cannot create virtualenv becuase it cannot find: '
logger.error('Cannot create virtualenv because it cannot find: '
+ ', '.join(const.SUPPORT_PACKAE[self.package_manager_name]))
logger.error("Please run with '-a' and '-d' option.")
return False
Expand Down
Loading