diff options
author | Peter Marko <peter.marko@siemens.com> | 2017-06-07 08:04:29 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-12 15:08:30 +0100 |
commit | 7e9a61cab88273e08b45d52ab4a975ad2bac3731 (patch) | |
tree | 73a87cd450ed0e3e4d30dc1327662a7da077f44c /meta/classes/cve-check.bbclass | |
parent | 1a146e58854c0998b840945c18c9bfc1e8bd1f42 (diff) | |
download | poky-7e9a61cab88273e08b45d52ab4a975ad2bac3731.tar.gz |
cve-check: do not parse error output
Sometimes there are control messages in cve-check-tool printed to
stderr. These lead to parsing error and thus failed build.
This can happen for instance when cve database needs to be
refreshed during build.
(From OE-Core rev: 6d8a17f4c50be292990e37de65630a6b84466ee6)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cve-check.bbclass')
-rw-r--r-- | meta/classes/cve-check.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 09487f1174..f5d73fdeba 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass | |||
@@ -176,7 +176,7 @@ def check_cves(d, patched_cves): | |||
176 | f.write("%s,%s,%s," % (bpn, pv, cves)) | 176 | f.write("%s,%s,%s," % (bpn, pv, cves)) |
177 | cmd.append(faux) | 177 | cmd.append(faux) |
178 | 178 | ||
179 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") | 179 | output = subprocess.check_output(cmd).decode("utf-8") |
180 | bb.debug(2, "Output of command %s:\n%s" % ("\n".join(cmd), output)) | 180 | bb.debug(2, "Output of command %s:\n%s" % ("\n".join(cmd), output)) |
181 | except subprocess.CalledProcessError as e: | 181 | except subprocess.CalledProcessError as e: |
182 | bb.warn("Couldn't check for CVEs: %s (output %s)" % (e, e.output)) | 182 | bb.warn("Couldn't check for CVEs: %s (output %s)" % (e, e.output)) |