Skip to content

Commit 104c760

Browse files
committed
fix nix
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent a69c886 commit 104c760

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

vulnerabilities/importer.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,10 @@ def from_dict(cls, affected_pkg: dict):
188188
"""
189189
package = PackageURL(**affected_pkg["package"])
190190
affected_version_range = None
191-
if affected_pkg["affected_version_range"]:
191+
if (
192+
affected_pkg["affected_version_range"]
193+
and affected_pkg["affected_version_range"] != "None"
194+
):
192195
affected_version_range = VersionRange.from_string(
193196
affected_pkg["affected_version_range"]
194197
)

vulnerabilities/improvers/default.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ def get_exact_purls(affected_package: AffectedPackage) -> (List[PackageURL], Pac
6464
# We need ``if c`` below because univers returns None as version
6565
# in case of vers:nginx/*
6666
# TODO: Revisit after https://github.com/nexB/univers/issues/33
67-
range_versions = [c.version for c in vr.constraints if c]
68-
resolved_versions = [v for v in range_versions if v and v in vr]
69-
7067
affected_purls = []
71-
for version in resolved_versions:
72-
affected_purl = affected_package.package._replace(version=str(version))
73-
affected_purls.append(affected_purl)
68+
if vr:
69+
range_versions = [c.version for c in vr.constraints if c]
70+
resolved_versions = [v for v in range_versions if v and v in vr]
71+
for version in resolved_versions:
72+
affected_purl = affected_package.package._replace(version=str(version))
73+
affected_purls.append(affected_purl)
7474

75-
fixed_purl = affected_package.get_fixed_purl()
75+
fixed_purl = affected_package.get_fixed_purl() if affected_package.fixed_version else None
7676

7777
return affected_purls, fixed_purl

0 commit comments

Comments
 (0)