summaryrefslogtreecommitdiffstats
path: root/meta/classes/cve-check.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/cve-check.bbclass')
-rw-r--r--meta/classes/cve-check.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index 669da6c8e9..93af667544 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -203,7 +203,7 @@ def check_cves(d, patched_cves):
203 """ 203 """
204 Connect to the NVD database and find unpatched cves. 204 Connect to the NVD database and find unpatched cves.
205 """ 205 """
206 from distutils.version import LooseVersion 206 from oe.cve_check import Version
207 207
208 pn = d.getVar("PN") 208 pn = d.getVar("PN")
209 real_pv = d.getVar("PV") 209 real_pv = d.getVar("PV")
@@ -260,8 +260,8 @@ def check_cves(d, patched_cves):
260 else: 260 else:
261 if operator_start: 261 if operator_start:
262 try: 262 try:
263 vulnerable_start = (operator_start == '>=' and LooseVersion(pv) >= LooseVersion(version_start)) 263 vulnerable_start = (operator_start == '>=' and Version(pv) >= Version(version_start))
264 vulnerable_start |= (operator_start == '>' and LooseVersion(pv) > LooseVersion(version_start)) 264 vulnerable_start |= (operator_start == '>' and Version(pv) > Version(version_start))
265 except: 265 except:
266 bb.warn("%s: Failed to compare %s %s %s for %s" % 266 bb.warn("%s: Failed to compare %s %s %s for %s" %
267 (product, pv, operator_start, version_start, cve)) 267 (product, pv, operator_start, version_start, cve))
@@ -271,8 +271,8 @@ def check_cves(d, patched_cves):
271 271
272 if operator_end: 272 if operator_end:
273 try: 273 try:
274 vulnerable_end = (operator_end == '<=' and LooseVersion(pv) <= LooseVersion(version_end)) 274 vulnerable_end = (operator_end == '<=' and Version(pv) <= Version(version_end) )
275 vulnerable_end |= (operator_end == '<' and LooseVersion(pv) < LooseVersion(version_end)) 275 vulnerable_end |= (operator_end == '<' and Version(pv) < Version(version_end) )
276 except: 276 except:
277 bb.warn("%s: Failed to compare %s %s %s for %s" % 277 bb.warn("%s: Failed to compare %s %s %s for %s" %
278 (product, pv, operator_end, version_end, cve)) 278 (product, pv, operator_end, version_end, cve))