diff options
| author | Chris Laplante <chris.laplante@agilent.com> | 2020-09-14 11:33:18 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-06 14:15:21 +0100 |
| commit | b623ea2d299e63094dbdb2ed03ffc0b441f71e7e (patch) | |
| tree | 4ca6058ee6aa59d18eb4862d8152f7434c0797af | |
| parent | 275a0baa72184cf0f62e0012e5bc2dfaaf41fa71 (diff) | |
| download | poky-b623ea2d299e63094dbdb2ed03ffc0b441f71e7e.tar.gz | |
cve-update-db-native: be less magical about checking whether the cve-check class is enabled
(From OE-Core rev: ec2a17001a2a0180ecdb0b946ff8f7673e14ba24)
Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit cbc717350b21fb417fa6f83621022ac633a26124)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/meta/cve-update-db-native.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 328f6ab364..2c0e508e32 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb | |||
| @@ -13,8 +13,7 @@ deltask do_install | |||
| 13 | deltask do_populate_sysroot | 13 | deltask do_populate_sysroot |
| 14 | 14 | ||
| 15 | python () { | 15 | python () { |
| 16 | cve_check_db_file = d.getVar("CVE_CHECK_DB_FILE") | 16 | if not bb.data.inherits_class("cve-check", d): |
| 17 | if not cve_check_db_file: | ||
| 18 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") | 17 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") |
| 19 | 18 | ||
| 20 | if os.path.exists("%s-journal" % cve_check_db_file ): | 19 | if os.path.exists("%s-journal" % cve_check_db_file ): |