summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-02 23:45:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:39:00 +0000
commit7fa6eeba1c1e4667820c8543343083fad75cabee (patch)
tree1f1c38bf800d5b8aacf00586cb3ce5145109d4f5 /meta/lib/oe
parent252e64550a77b8e4a452d4f124bb8b378054d4de (diff)
downloadpoky-7fa6eeba1c1e4667820c8543343083fad75cabee.tar.gz
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. (From OE-Core rev: 42a10788e89b07b14a150ced07113566cf99fcdd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/data.py2
-rw-r--r--meta/lib/oe/packagegroup.py4
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
3def typed_value(key, d): 3def typed_value(key, d):
4 """Construct a value for the specified metadata variable, using its flags 4 """Construct a value for the specified metadata variable, using its flags
5 to determine the type and parameters for construction.""" 5 to determine the type and parameters for construction."""
6 var_type = d.getVarFlag(key, 'type') 6 var_type = d.getVarFlag(key, 'type', True)
7 flags = d.getVarFlags(key) 7 flags = d.getVarFlags(key)
8 if flags is not None: 8 if flags is not None:
9 flags = dict((flag, d.expand(value)) 9 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
3def is_optional(feature, d): 3def is_optional(feature, d):
4 packages = d.getVar("FEATURE_PACKAGES_%s" % feature, True) 4 packages = d.getVar("FEATURE_PACKAGES_%s" % feature, True)
5 if packages: 5 if packages:
6 return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) 6 return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional", True))
7 else: 7 else:
8 return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional")) 8 return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional", True))
9 9
10def packages(features, d): 10def packages(features, d):
11 for feature in features: 11 for feature in features: