diff options
| author | Ross Burton <ross.burton@intel.com> | 2019-07-18 21:03:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-19 16:19:14 +0100 |
| commit | 3cd004128d9b258636c2a95c6bb93969896c858f (patch) | |
| tree | 4a1db2eae7a48a75c64390f7bb6fbd5904566ccb | |
| parent | 2a11ee3ad248bc97c65b4be02dc80d7eb7f5cde3 (diff) | |
| download | poky-3cd004128d9b258636c2a95c6bb93969896c858f.tar.gz | |
cve-update-db-native: use os.path.join instead of +
(From OE-Core rev: 4b301030cf9cf7a981dcff85a50e915c045e3130)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/meta/cve-update-db-native.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 3519beae5f..9047513dbd 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb | |||
| @@ -29,11 +29,11 @@ python do_populate_cve_db() { | |||
| 29 | BASE_URL = "https://nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-" | 29 | BASE_URL = "https://nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-" |
| 30 | YEAR_START = 2002 | 30 | YEAR_START = 2002 |
| 31 | 31 | ||
| 32 | db_dir = d.getVar("DL_DIR") + '/CVE_CHECK' | 32 | db_dir = os.path.join(d.getVar("DL_DIR"), 'CVE_CHECK') |
| 33 | db_file = db_dir + '/nvdcve_1.0.db' | 33 | db_file = os.path.join(db_dir, 'nvdcve_1.0.db') |
| 34 | json_tmpfile = db_dir + '/nvd.json.gz' | 34 | json_tmpfile = os.path.join(db_dir, 'nvd.json.gz') |
| 35 | proxy = d.getVar("https_proxy") | 35 | proxy = d.getVar("https_proxy") |
| 36 | cve_f = open(d.getVar("TMPDIR") + '/cve_check', 'a') | 36 | cve_f = open(os.path.join(d.getVar("TMPDIR"), 'cve_check'), 'a') |
| 37 | 37 | ||
| 38 | if not os.path.isdir(db_dir): | 38 | if not os.path.isdir(db_dir): |
| 39 | os.mkdir(db_dir) | 39 | os.mkdir(db_dir) |