Skip to content

Commit 0ef044a

Browse files
committed
Always convert the package_content value when available
Signed-off-by: tdruez <tdruez@aboutcode.org>
1 parent b1fae3a commit 0ef044a

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

component_catalog/models.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2649,9 +2649,6 @@ def update_from_purldb(self, user):
26492649
package_data = purldb_entries[0]
26502650
elif source_package := pick_source_package(purldb_entries):
26512651
package_data = source_package
2652-
package_data["package_content"] = Package.get_package_content_value_from_label(
2653-
package_data["package_content"]
2654-
)
26552652
else:
26562653
package_data = merge_common_non_empty_values(purldb_entries)
26572654

@@ -2660,6 +2657,10 @@ def update_from_purldb(self, user):
26602657
package_data["release_date"] = release_date.split("T")[0]
26612658
package_data["license_expression"] = package_data.get("declared_license_expression")
26622659

2660+
if package_content := package_data.get("package_content"):
2661+
package_content_value = Package.get_package_content_value_from_label(package_content)
2662+
package_data["package_content"] = package_content_value
2663+
26632664
# Avoid raising an IntegrityError when the values in `package_data` for the
26642665
# identifier fields already exist on another Package instance.
26652666
#

component_catalog/tests/test_models.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2646,6 +2646,7 @@ def test_package_model_update_from_purldb(self, mock_get_purldb_entries):
26462646
"sha256": "0a1efde1b685a6c30999ba00902f23613cf5db864c5a1532d2edf3eda7896a37",
26472647
"copyright": "(c) Copyright",
26482648
"declared_license_expression": "(bsd-simplified AND bsd-new)",
2649+
"package_content": "source_archive",
26492650
}
26502651

26512652
mock_get_purldb_entries.return_value = [purldb_entry]
@@ -2667,12 +2668,13 @@ def test_package_model_update_from_purldb(self, mock_get_purldb_entries):
26672668
"sha256",
26682669
"copyright",
26692670
"declared_license_expression",
2671+
"package_content",
26702672
"license_expression",
26712673
]
26722674
self.assertEqual(expected, updated_fields)
26732675

26742676
package1.refresh_from_db()
2675-
# Handle release_date separatly
2677+
# Handle release_date and package_content separatly
26762678
updated_fields.remove("release_date")
26772679
self.assertEqual(purldb_entry["release_date"], str(package1.release_date))
26782680

0 commit comments

Comments
 (0)