Skip to content

Commit d0332ca

Browse files
authored
Fix the cargo purl bug (#260)
* Fix the cargo purl bug * Update the requirements.txt --------- Signed-off-by: 석지영/책임연구원/SW공학(연)Open Source TP <[email protected]>
1 parent 60e9961 commit d0332ca

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ lxml
44
virtualenv
55
pyyaml
66
lastversion
7-
fosslight_util>=2.1.6
7+
fosslight_util>=2.1.18
88
PyGithub
99
requirements-parser
1010
defusedxml

src/fosslight_dependency/_package_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''):
277277
purl = f'{purl}#{match.group(2)}'
278278
elif pkg_manager == 'go':
279279
purl = f'{purl_prefix}lang/{match.group(1)}@{match.group(2)}'
280+
elif pkg_manager == 'cargo':
281+
purl = f'{purl_prefix}/{oss_name}@{oss_version}'
280282
else:
281283
if pkg_manager == 'swift':
282284
if oss_version:
@@ -286,8 +288,6 @@ def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''):
286288
elif pkg_manager == 'carthage':
287289
if oss_version:
288290
purl = f'{purl}@{oss_version}'
289-
elif pkg_manager == 'cargo':
290-
purl = f'{purl_prefix}/{oss_name}@{oss_version}'
291291
except Exception:
292292
logger.debug('Fail to get purl. So use the link purl({purl}).')
293293
return purl

0 commit comments

Comments
 (0)