diff options
| author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 08:30:03 +0000 |
| commit | 2dea9e490a98377010b3d4118d054814c317a735 (patch) | |
| tree | 8f147f6c6ebc6c74838a69457d71fe7de5dbb3fd /meta/lib/oe | |
| parent | 0a36bd96e6b29fd99a296efc358ca3e9fb5af735 (diff) | |
| download | openembedded-core-2dea9e490a98377010b3d4118d054814c317a735.tar.gz openembedded-core-2dea9e490a98377010b3d4118d054814c317a735.tar.bz2 openembedded-core-2dea9e490a98377010b3d4118d054814c317a735.zip | |
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\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/lib/oe')
| -rw-r--r-- | meta/lib/oe/data.py | 2 | ||||
| -rw-r--r-- | meta/lib/oe/packagegroup.py | 4 | ||||
| -rw-r--r-- | meta/lib/oe/sstatesig.py | 2 |
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 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', True) + var_type = d.getVarFlag(key, 'type') 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 d68e5d322b..4bc5d3e4bb 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) if packages: - return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional", True)) + return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) else: - return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional", True)) + return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional")) def packages(features, d): 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): Also returns the datastore that can be used to query related variables. """ d2 = d.createCopy() - extrainf = d.getVarFlag("do_" + task, 'stamp-extra-info', True) + extrainf = d.getVarFlag("do_" + task, 'stamp-extra-info') if extrainf: d2.setVar("SSTATE_MANMACH", extrainf) return (d2.expand("${SSTATE_MANFILEPREFIX}.%s" % task), d2) |