[PATCH] cve-check: put log in T so it doesn't get deleted by rm_work

[PATCH] cve-check: put log in T so it doesn't get deleted by rm_work

[Ross Burton]

This is where the other task logs go, so it's a sensible place to put it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/cve-check.bbclass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index bc2f03f7ddb..62dd6424d5c 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -27,8 +27,7 @@ CVE_PRODUCT ??= "${BPN}"
 CVE_CHECK_DB_DIR ?= "${DL_DIR}/CVE_CHECK"
 CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvd.db"
 
-CVE_CHECK_LOCAL_DIR ?= "${WORKDIR}/cve"
-CVE_CHECK_LOCAL_FILE ?= "${CVE_CHECK_LOCAL_DIR}/cve.log"
+CVE_CHECK_LOG ?= "${T}/cve.log"
 CVE_CHECK_TMP_FILE ?= "${TMPDIR}/cve_check"
 
 CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve"
@@ -251,11 +250,11 @@ def cve_write_data(d, patched, unpatched, cve_data):
     CVE manifest if enabled.
     """
 
-    cve_file = d.getVar("CVE_CHECK_LOCAL_FILE")
+    cve_file = d.getVar("CVE_CHECK_LOG")
     nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId="
     write_string = ""
     unpatched_cves = []
-    bb.utils.mkdirhier(d.getVar("CVE_CHECK_LOCAL_DIR"))
+    bb.utils.mkdirhier(os.path.dirname(cve_file))
 
     for cve in sorted(cve_data):
         write_string += "PACKAGE NAME: %s\n" % d.getVar("PN")
-- 
2.11.0

Re: [PATCH] cve-check: put log in T so it doesn't get deleted by rm_work

[Alexander Kanavin]

On 02/09/2018 01:09 AM, Ross Burton wrote:
> This is where the other task logs go, so it's a sensible place to put it.

There is a bunch of other cve-check related commits in master now that 
were never posted here, why is that?

Alex

Re: [PATCH] cve-check: put log in T so it doesn't get deleted by rm_work

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

Because I failed to post them to the list and Richard merged a chunk of MUT
on my approval, forgetting that I hadn't posted them.  My mistake,
apologies.

Ross

On 17 February 2018 at 14:38, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> On 02/09/2018 01:09 AM, Ross Burton wrote:
>
>> This is where the other task logs go, so it's a sensible place to put it.
>>
>
> There is a bunch of other cve-check related commits in master now that
> were never posted here, why is that?
>
> Alex
>

[-- Attachment #2: Type: text/html, Size: 997 bytes --]

Re: [PATCH] cve-check: put log in T so it doesn't get deleted by rm_work

[Alexander Kanavin]

Cheers, can you nevertheless post the missing patches here please?

Alex


On 02/18/2018 02:19 AM, Burton, Ross wrote:
> Because I failed to post them to the list and Richard merged a chunk of 
> MUT on my approval, forgetting that I hadn't posted them.  My mistake, 
> apologies.
> 
> Ross
> 
> On 17 February 2018 at 14:38, Alexander Kanavin 
> <alexander.kanavin@linux.intel.com 
> <mailto:alexander.kanavin@linux.intel.com>> wrote:
> 
>     On 02/09/2018 01:09 AM, Ross Burton wrote:
> 
>         This is where the other task logs go, so it's a sensible place
>         to put it.
> 
> 
>     There is a bunch of other cve-check related commits in master now
>     that were never posted here, why is that?
> 
>     Alex
> 
>