summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-12-14 21:13:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-16 10:23:23 +0000
commit3c59b1bf93adb0b9f723bda1d8702c8720733677 (patch)
treed1939643e2d02f0ce2e9ef33e235cd23cd5000d3 /meta/lib
parentc0f2890c01882e9ea14e781c044f3a84f75bd0fc (diff)
downloadpoky-3c59b1bf93adb0b9f723bda1d8702c8720733677.tar.gz
meta: remove True option to getVarFlag calls
getVarFlag() now defaults to expanding by default, thus remove the True option from getVarFlag() calls with a regex search and replace. Search made with the following regex: getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\) (From OE-Core rev: 2dea9e490a98377010b3d4118d054814c317a735) 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')
-rw-r--r--meta/lib/oe/data.py2
-rw-r--r--meta/lib/oe/packagegroup.py4
-rw-r--r--meta/lib/oe/sstatesig.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/data.py b/meta/lib/oe/data.py
index 032f68a847..4a67c457b3 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', True) 6 var_type = d.getVarFlag(key, 'type')
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 d68e5d322b..4bc5d3e4bb 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) 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"))
7 else: 7 else:
8 return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional", True)) 8 return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional"))
9 9
10def packages(features, d): 10def packages(features, d):
11 for feature in features: 11 for feature in features:
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index e053c37e96..bd11e2f888 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -348,7 +348,7 @@ def sstate_get_manifest_filename(task, d):
348 Also returns the datastore that can be used to query related variables. 348 Also returns the datastore that can be used to query related variables.
349 """ 349 """
350 d2 = d.createCopy() 350 d2 = d.createCopy()
351 extrainf = d.getVarFlag("do_" + task, 'stamp-extra-info', True) 351 extrainf = d.getVarFlag("do_" + task, 'stamp-extra-info')
352 if extrainf: 352 if extrainf:
353 d2.setVar("SSTATE_MANMACH", extrainf) 353 d2.setVar("SSTATE_MANMACH", extrainf)
354 return (d2.expand("${SSTATE_MANFILEPREFIX}.%s" % task), d2) 354 return (d2.expand("${SSTATE_MANFILEPREFIX}.%s" % task), d2)