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/lib/oe/packagegroup.py | |
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/lib/oe/packagegroup.py')
-rw-r--r-- | meta/lib/oe/packagegroup.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/packagegroup.py b/meta/lib/oe/packagegroup.py index 97819279b7..d68e5d322b 100644 --- a/meta/lib/oe/packagegroup.py +++ b/meta/lib/oe/packagegroup.py | |||
@@ -1,7 +1,7 @@ | |||
1 | import itertools | 1 | import itertools |
2 | 2 | ||
3 | def is_optional(feature, d): | 3 | def is_optional(feature, d): |
4 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature, True) | 4 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature) |
5 | if packages: | 5 | if packages: |
6 | return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional", True)) | 6 | return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional", True)) |
7 | else: | 7 | else: |
@@ -9,9 +9,9 @@ def is_optional(feature, d): | |||
9 | 9 | ||
10 | def packages(features, d): | 10 | def packages(features, d): |
11 | for feature in features: | 11 | for feature in features: |
12 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature, True) | 12 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature) |
13 | if not packages: | 13 | if not packages: |
14 | packages = d.getVar("PACKAGE_GROUP_%s" % feature, True) | 14 | packages = d.getVar("PACKAGE_GROUP_%s" % feature) |
15 | for pkg in (packages or "").split(): | 15 | for pkg in (packages or "").split(): |
16 | yield pkg | 16 | yield pkg |
17 | 17 | ||