From f22570a4cef82c3b36067314986275162a51b6fd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Sep 2024 13:17:55 -0700 Subject: [PATCH] Conditionally remove modified column Signed-off-by: Jonathan Ringer --- src/sbomnix/sbomdb.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sbomnix/sbomdb.py b/src/sbomnix/sbomdb.py index 59289b4..79383da 100644 --- a/src/sbomnix/sbomdb.py +++ b/src/sbomnix/sbomdb.py @@ -219,8 +219,9 @@ def to_cdx(self, cdx_path, printinfo=True): [scanner.df_grype, scanner.df_osv, scanner.df_vulnix], ignore_index=True, ) - # Concat adds a modified column, remove - vulns.drop("modified", axis=1, inplace=True) + # Concat adds a modified column, remove as it will invalidate groupby logic + if "modified" in vulns.columns: + vulns.drop("modified", axis=1, inplace=True) # Deduplicate repeated vulnerabilities, making the scanner column into an array vuln_grouped = vulns.groupby( ["package", "version", "severity", "vuln_id"],