summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-12-08 18:35:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:11:10 (GMT)
commitf9b5a31a654baa7e9eb4ea960d1aeb246877da3f (patch)
tree5ba65b9edc08193376f6112af30bc85adc638db9
parent1675f9638ab6387f492cefa9eac106f627722e12 (diff)
downloadpoky-f9b5a31a654baa7e9eb4ea960d1aeb246877da3f.tar.gz
cve-check: failure to parse versions should be more visible
(From OE-Core rev: 72f44bef3867295f73f8b91e17294b2876447c89) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cve-check.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index f87bcc9..1c8b222 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -222,7 +222,7 @@ def check_cves(d, patched_cves):
222 to_append_start = (operator_start == '>=' and LooseVersion(pv) >= LooseVersion(version_start)) 222 to_append_start = (operator_start == '>=' and LooseVersion(pv) >= LooseVersion(version_start))
223 to_append_start |= (operator_start == '>' and LooseVersion(pv) > LooseVersion(version_start)) 223 to_append_start |= (operator_start == '>' and LooseVersion(pv) > LooseVersion(version_start))
224 except: 224 except:
225 bb.note("%s: Failed to compare %s %s %s for %s" % 225 bb.warn("%s: Failed to compare %s %s %s for %s" %
226 (product, pv, operator_start, version_start, cve)) 226 (product, pv, operator_start, version_start, cve))
227 to_append_start = False 227 to_append_start = False
228 else: 228 else:
@@ -233,7 +233,7 @@ def check_cves(d, patched_cves):
233 to_append_end = (operator_end == '<=' and LooseVersion(pv) <= LooseVersion(version_end)) 233 to_append_end = (operator_end == '<=' and LooseVersion(pv) <= LooseVersion(version_end))
234 to_append_end |= (operator_end == '<' and LooseVersion(pv) < LooseVersion(version_end)) 234 to_append_end |= (operator_end == '<' and LooseVersion(pv) < LooseVersion(version_end))
235 except: 235 except:
236 bb.note("%s: Failed to compare %s %s %s for %s" % 236 bb.warn("%s: Failed to compare %s %s %s for %s" %
237 (product, pv, operator_end, version_end, cve)) 237 (product, pv, operator_end, version_end, cve))
238 to_append_end = False 238 to_append_end = False
239 else: 239 else: