From 42a10788e89b07b14a150ced07113566cf99fcdd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Feb 2016 23:45:46 +0000 Subject: 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 --- meta/lib/oe/data.py | 2 +- meta/lib/oe/packagegroup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/lib/oe') 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: -- cgit 1.2.3-korg