[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6212/8267] cve-check: do not parse error output



commit 7e9a61cab88273e08b45d52ab4a975ad2bac3731
Author: Peter Marko <peter marko siemens com>
Date:   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.
    
    (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>

 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 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))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]