[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6211/8267] cve-check: clean cve-check recipe result before re-building

[Emmanuele Bassi <ebassi src gnome org>]

commit 1a146e58854c0998b840945c18c9bfc1e8bd1f42
Author: Peter Marko <peter marko siemens com>
Date:   Wed Jun 7 08:04:30 2017 +0200

    cve-check: clean cve-check recipe result before re-building
    
    If there is cve report for a recipe in previous build and there
    is no result for current one, old cves are kept in CVE_CHECK_DIR.
    This happens on version upgrade or when cve/recipe is whitelisted.
    
    (From OE-Core rev: 85b4941c71a0e3c08a8c48d52a94dfe2897d2c92)
    
    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 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index 3a9e227..09487f1 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -83,6 +83,11 @@ python cve_check_write_rootfs_manifest () {
 
     import shutil
 
+    if d.getVar("CVE_CHECK_COPY_FILES") == "1":
+        deploy_file = os.path.join(d.getVar("CVE_CHECK_DIR"), d.getVar("PN"))
+        if os.path.exists(deploy_file):
+            bb.utils.remove(deploy_file)
+
     if os.path.exists(d.getVar("CVE_CHECK_TMP_FILE")):
         bb.note("Writing rootfs CVE manifest")
         deploy_dir = d.getVar("DEPLOY_DIR_IMAGE")