File tree Expand file tree Collapse file tree
vulnerabilities/importers Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -103,15 +103,33 @@ def affected_and_safe_purls(affected_elem):
103103 purl = PackageURL (type = "ebuild" , name = pkg_name , namespace = pkg_ns )
104104 safe_versions , affected_versions = GentooImporter .get_safe_and_affected_versions (pkg )
105105
106+ # for version in safe_versions:
107+ # constraints.append(
108+ # VersionConstraint(version=GentooVersion(version), comparator="=").invert()
109+ # )
110+
111+ # for version in affected_versions:
112+ # constraints.append(
113+ # VersionConstraint(version=GentooVersion(version), comparator="=")
114+ # )
115+
116+ def clean_ver (v ):
117+ # removes ":something" which univers rejects
118+ return v .split (":" , 1 )[0 ]
119+
106120 for version in safe_versions :
107- constraints .append (
108- VersionConstraint (version = GentooVersion (version ), comparator = "=" ).invert ()
109- )
121+ try :
122+ v_obj = GentooVersion (version )
123+ except Exception :
124+ v_obj = GentooVersion (clean_ver (version ))
125+ constraints .append (VersionConstraint (version = v_obj , comparator = "=" ).invert ())
110126
111127 for version in affected_versions :
112- constraints .append (
113- VersionConstraint (version = GentooVersion (version ), comparator = "=" )
114- )
128+ try :
129+ v_obj = GentooVersion (version )
130+ except Exception :
131+ v_obj = GentooVersion (clean_ver (version ))
132+ constraints .append (VersionConstraint (version = v_obj , comparator = "=" ))
115133
116134 if not constraints :
117135 continue
You can’t perform that action at this time.
0 commit comments