Merge 6c71afa into e1c5d47

cisagov · Jan 20, 2022 · 9dd5815 · 9dd5815
2 parents e1c5d47 + 6c71afa
commit 9dd5815
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/mdyml/convert_cisagov.py b/src/mdyml/convert_cisagov.py
@@ -193,7 +193,9 @@ def convert() -> None:
                         "url": "https://github.com/cisagov/log4j-affected-db",
                     }
                 ],
-                "software": data,
+                "software": sorted(
+                    data, key=lambda p: (p["vendor"].lower(), p["product"].lower())
+                ),
             }
 
             yaml = ruamel.yaml.YAML()

diff --git a/src/yml/normalize_yml.py b/src/yml/normalize_yml.py
@@ -65,7 +65,7 @@ def normalize(data: YamlData) -> YamlData:
 
 def sort(data: YamlData) -> YamlData:
     """Sort the software entries."""
-    data["software"].sort(key=lambda x: (x["vendor"] + x["product"]).lower())
+    data["software"].sort(key=lambda x: (x["vendor"].lower(), x["product"].lower()))
     return data