Skip to content

Commit 293ddc5

Browse files
committed
Handle multiple discoveredpackages with the same PURL
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 745140b commit 293ddc5

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

scanpipe/pipes/d2d.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -913,16 +913,16 @@ def _map_javascript_npm_lookup_resource(
913913
if not matched:
914914
return 0
915915

916-
try:
917-
package = project.discoveredpackages.get(
918-
type=purl.type,
919-
namespace="" if not purl.namespace else purl.namespace,
920-
name=purl.name,
921-
version=purl.version,
922-
)
916+
package = project.discoveredpackages.filter(
917+
type=purl.type,
918+
namespace="" if not purl.namespace else purl.namespace,
919+
name=purl.name,
920+
version=purl.version,
921+
).first()
922+
923+
if package:
923924
package.add_resources(matched)
924-
925-
except DiscoveredPackage.DoesNotExist:
925+
else:
926926
if results := purldb.fetch_package(purl=str(purl)):
927927
package_data = results[0]
928928
package_data.pop("uuid", None)

0 commit comments

Comments
 (0)