diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/blacklist.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/blacklist.bbclass')
-rw-r--r-- | meta/classes/blacklist.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass index a0141a82c0..c6f422398c 100644 --- a/meta/classes/blacklist.bbclass +++ b/meta/classes/blacklist.bbclass | |||
@@ -16,7 +16,7 @@ | |||
16 | addhandler blacklist_multilib_eventhandler | 16 | addhandler blacklist_multilib_eventhandler |
17 | blacklist_multilib_eventhandler[eventmask] = "bb.event.ConfigParsed" | 17 | blacklist_multilib_eventhandler[eventmask] = "bb.event.ConfigParsed" |
18 | python blacklist_multilib_eventhandler() { | 18 | python blacklist_multilib_eventhandler() { |
19 | multilibs = e.data.getVar('MULTILIBS', True) | 19 | multilibs = e.data.getVar('MULTILIBS') |
20 | if not multilibs: | 20 | if not multilibs: |
21 | return | 21 | return |
22 | 22 | ||
@@ -38,7 +38,7 @@ python blacklist_multilib_eventhandler() { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | python () { | 40 | python () { |
41 | blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN', True), True) | 41 | blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN'), True) |
42 | 42 | ||
43 | if blacklist: | 43 | if blacklist: |
44 | raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist)) | 44 | raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist)) |