From 4628fe12e7f2767d243949197c8326e3b7396301 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Feb 2016 23:49:09 +0000 Subject: bitbake: lib/bb: Add expansion parameter to getVarFlag This sets the scene for removing the default False for expansion from getVarFlag. This would later allow True to become the expand default. On the most part this is an automatic translation with: sed -e 's:\(\.getVarFlag([^,()]*, [^,()]*\)):\1, False):g' -i `grep -ril getVar *` There should be no functional change from this patch. (Bitbake rev: 7c3b99c6a716095af3ffce0b15110e91fb49c913) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/bb/data_smart.py') diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index a6611c4e94..70d314d35b 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -147,7 +147,7 @@ class DataContext(dict): def __missing__(self, key): value = self.metadata.getVar(key, True) - if value is None or self.metadata.getVarFlag(key, 'func'): + if value is None or self.metadata.getVarFlag(key, 'func', False): raise KeyError(key) else: return value @@ -480,7 +480,7 @@ class DataSmart(MutableMapping): base = match.group('base') keyword = match.group("keyword") override = match.group('add') - l = self.getVarFlag(base, keyword) or [] + l = self.getVarFlag(base, keyword, False) or [] l.append([value, override]) self.setVarFlag(base, keyword, l, ignore=True) # And cause that to be recorded: @@ -582,11 +582,11 @@ class DataSmart(MutableMapping): self.setVar(newkey, val, ignore=True, parsing=True) for i in (__setvar_keyword__): - src = self.getVarFlag(key, i) + src = self.getVarFlag(key, i, False) if src is None: continue - dest = self.getVarFlag(newkey, i) or [] + dest = self.getVarFlag(newkey, i, False) or [] dest.extend(src) self.setVarFlag(newkey, i, dest, ignore=True) -- cgit v1.2.3-54-g00ecf