[oe-commits] [openembedded-core] 07/41: cve-check: do not parse error output

git at git.openembedded.org git at git.openembedded.org
Sun Jun 11 09:58:53 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit c6e82201a6aa6b47265017a9c6369ef77a09ab13
Author: Peter Marko <peter.marko at siemens.com>
AuthorDate: Wed Jun 7 08:04:29 2017 +0200

    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.
    
    Signed-off-by: Peter Marko <peter.marko at siemens.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/cve-check.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index 09487f1..f5d73fd 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -176,7 +176,7 @@ def check_cves(d, patched_cves):
             f.write("%s,%s,%s," % (bpn, pv, cves))
         cmd.append(faux)
 
-        output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8")
+        output = subprocess.check_output(cmd).decode("utf-8")
         bb.debug(2, "Output of command %s:\n%s" % ("\n".join(cmd), output))
     except subprocess.CalledProcessError as e:
         bb.warn("Couldn't check for CVEs: %s (output %s)" % (e, e.output))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list