From 47179f62f5447c09dee44af13c0049043f5a4738 Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Sun, 5 Feb 2023 01:18:46 +0100 Subject: [PATCH] Make OSV consistent --- apollo/server/routes/api_osv.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apollo/server/routes/api_osv.py b/apollo/server/routes/api_osv.py index a773960..0da6c3e 100644 --- a/apollo/server/routes/api_osv.py +++ b/apollo/server/routes/api_osv.py @@ -106,20 +106,20 @@ def to_osv_advisory(ui_url: str, advisory: Advisory) -> OSVAdvisory: pkg_name_map = {} for pkg in advisory.packages: - if pkg.package_name not in pkg_name_map: - pkg_name_map[pkg.package_name] = {} - - product_name = pkg.product_name + product_name = slugify(pkg.product_name) if pkg.supported_products_rh_mirror: - product_name = f"{pkg.supported_product.variant}:{pkg.supported_products_rh_mirror.match_major_version}" - if product_name not in pkg_name_map[pkg.package_name]: - pkg_name_map[pkg.package_name][product_name] = [] + product_name = f"{slugify(pkg.supported_product.variant)}:{pkg.supported_products_rh_mirror.match_major_version}" - pkg_name_map[pkg.package_name][product_name].append(pkg) + if product_name not in pkg_name_map: + pkg_name_map[product_name] = {} + if pkg.package_name not in pkg_name_map[product_name]: + pkg_name_map[product_name][pkg.package_name] = [] + + pkg_name_map[product_name][pkg.package_name].append(pkg) vendors = [] - for pkg_name, affected_products in pkg_name_map.items(): - for product_name, affected_packages in affected_products.items(): + for product_name, pkgs in pkg_name_map.items(): + for pkg_name, affected_packages in pkgs.items(): if not affected_packages: continue