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/sign_package_feed.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/sign_package_feed.bbclass')
-rw-r--r-- | meta/classes/sign_package_feed.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sign_package_feed.bbclass b/meta/classes/sign_package_feed.bbclass index 31a6e9b042..71df03bab3 100644 --- a/meta/classes/sign_package_feed.bbclass +++ b/meta/classes/sign_package_feed.bbclass | |||
@@ -31,10 +31,10 @@ PACKAGE_FEED_GPG_SIGNATURE_TYPE ?= 'ASC' | |||
31 | python () { | 31 | python () { |
32 | # Check sanity of configuration | 32 | # Check sanity of configuration |
33 | for var in ('PACKAGE_FEED_GPG_NAME', 'PACKAGE_FEED_GPG_PASSPHRASE_FILE'): | 33 | for var in ('PACKAGE_FEED_GPG_NAME', 'PACKAGE_FEED_GPG_PASSPHRASE_FILE'): |
34 | if not d.getVar(var, True): | 34 | if not d.getVar(var): |
35 | raise_sanity_error("You need to define %s in the config" % var, d) | 35 | raise_sanity_error("You need to define %s in the config" % var, d) |
36 | 36 | ||
37 | sigtype = d.getVar("PACKAGE_FEED_GPG_SIGNATURE_TYPE", True) | 37 | sigtype = d.getVar("PACKAGE_FEED_GPG_SIGNATURE_TYPE") |
38 | if sigtype.upper() != "ASC" and sigtype.upper() != "BIN": | 38 | if sigtype.upper() != "ASC" and sigtype.upper() != "BIN": |
39 | raise_sanity_error("Bad value for PACKAGE_FEED_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype) | 39 | raise_sanity_error("Bad value for PACKAGE_FEED_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype) |
40 | } | 40 | } |