diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-02 23:45:46 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:35:03 +0000 |
commit | 42a10788e89b07b14a150ced07113566cf99fcdd (patch) | |
tree | 7d4f14c3993cf1822ad17f0d67c8820314b6f17b /meta/lib | |
parent | 247522b0eae6ec528350888d2283e84bb1e250fa (diff) | |
download | openembedded-core-42a10788e89b07b14a150ced07113566cf99fcdd.tar.gz openembedded-core-42a10788e89b07b14a150ced07113566cf99fcdd.tar.bz2 openembedded-core-42a10788e89b07b14a150ced07113566cf99fcdd.zip |
classes/lib: Add expand parameter to getVarFlag
This sets the scene for removing the default False for expansion
from getVarFlag. This would later allow True to become the default.
On the most part this is an automatic translation with:
sed -e 's:\(\.getVarFlag([^,()]*, [^,()]*\)):\1, True):g' -i `grep -ril getVar *`
In this case, the default was False, but True was used since in most
cases here expansion would be expected.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/data.py | 2 | ||||
-rw-r--r-- | meta/lib/oe/packagegroup.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/data.py b/meta/lib/oe/data.py index 4cc0e02968..e49572177b 100644 --- a/meta/lib/oe/data.py +++ b/meta/lib/oe/data.py @@ -3,7 +3,7 @@ import oe.maketype def typed_value(key, d): """Construct a value for the specified metadata variable, using its flags to determine the type and parameters for construction.""" - var_type = d.getVarFlag(key, 'type') + var_type = d.getVarFlag(key, 'type', True) flags = d.getVarFlags(key) if flags is not None: flags = dict((flag, d.expand(value)) diff --git a/meta/lib/oe/packagegroup.py b/meta/lib/oe/packagegroup.py index 12eb4212ff..a6fee5f950 100644 --- a/meta/lib/oe/packagegroup.py +++ b/meta/lib/oe/packagegroup.py @@ -3,9 +3,9 @@ import itertools def is_optional(feature, d): packages = d.getVar("FEATURE_PACKAGES_%s" % feature, True) if packages: - return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) + return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional", True)) else: - return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional")) + return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional", True)) def packages(features, d): for feature in features: |