From 3c59b1bf93adb0b9f723bda1d8702c8720733677 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 14 Dec 2016 21:13:06 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/data.py | 2 +- meta/lib/oe/packagegroup.py | 4 ++-- meta/lib/oe/sstatesig.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/lib') 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) -- cgit v1.2.3-54-g00ecf