diff --git a/requirements.txt b/requirements.txt index c68bb08a..61d20904 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ lxml virtualenv pyyaml lastversion -fosslight_util>=2.1.6 +fosslight_util>=2.1.18 PyGithub requirements-parser defusedxml diff --git a/src/fosslight_dependency/_package_manager.py b/src/fosslight_dependency/_package_manager.py index bfd1e0e7..086abf37 100644 --- a/src/fosslight_dependency/_package_manager.py +++ b/src/fosslight_dependency/_package_manager.py @@ -277,6 +277,8 @@ def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''): purl = f'{purl}#{match.group(2)}' elif pkg_manager == 'go': purl = f'{purl_prefix}lang/{match.group(1)}@{match.group(2)}' + elif pkg_manager == 'cargo': + purl = f'{purl_prefix}/{oss_name}@{oss_version}' else: if pkg_manager == 'swift': if oss_version: @@ -286,8 +288,6 @@ def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''): elif pkg_manager == 'carthage': if oss_version: purl = f'{purl}@{oss_version}' - elif pkg_manager == 'cargo': - purl = f'{purl_prefix}/{oss_name}@{oss_version}' except Exception: logger.debug('Fail to get purl. So use the link purl({purl}).') return purl