Skip to content

Commit e06fb5c

Browse files
committed
Fix get_purldb_entries when the purldb_entries value is None #303
Signed-off-by: tdruez <tdruez@nexb.com>
1 parent 5b3133a commit e06fb5c

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

component_catalog/models.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2473,6 +2473,9 @@ def get_purldb_entries(self, user, max_request_call=0, timeout=10):
24732473
if purldb_entries := purldb.find_packages(payload, timeout):
24742474
break
24752475

2476+
if not purldb_entries:
2477+
return []
2478+
24762479
# Cleanup the PurlDB entries:
24772480
# - Packages with different PURL are excluded.
24782481
if package_url:

component_catalog/tests/test_models.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2572,6 +2572,9 @@ def test_package_model_get_purldb_entries(self, mock_find_packages):
25722572
"name": "django",
25732573
}
25742574

2575+
mock_find_packages.return_value = None
2576+
purldb_entries = package1.get_purldb_entries(user=self.user)
2577+
25752578
mock_find_packages.return_value = [purldb_entry1, purldb_entry2]
25762579
purldb_entries = package1.get_purldb_entries(user=self.user)
25772580
# The purldb_entry2 is excluded as the PURL differs

product_portfolio/templates/product_portfolio/tabs/tab_imports.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</thead>
2626
<tbody>
2727
{% for scancode_project in scancode_projects %}
28-
<tr class="{% cycle 'odd' '' %}">
28+
<tr class="{% cycle 'odd' '' %}" data-uuid="{{ scancode_project.uuid }}">
2929
<td>
3030
{{ scancode_project.get_type_display }}
3131
{% if scancode_project.update_existing_packages %}

0 commit comments

Comments
 (0)