[bitbake-devel] [PATCH] cooker: Don't expand python functions in variable dumps
Richard Purdie
richard.purdie at linuxfoundation.org
Tue Feb 2 13:59:52 UTC 2016
We don't want to expand python functions since they aren't expanded
at execution time (e.g. anonymous python). They can also have side
effects.
This function is primarily used by toaster for variable dumps for later
display. The lack of expansion of python functions won't matter in this case
and actively helps some variable handling (e.g. SRCPV).
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index edd682b..fa5e631 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1429,14 +1429,21 @@ class BBCooker:
dump = {}
for k in self.data.keys():
try:
- v = self.data.getVar(k, True)
+ expand = True
+ flags = self.data.getVarFlags(k)
+ if flags and "func" in flags and "python" in flags:
+ expand = False
+ v = self.data.getVar(k, expand)
if not k.startswith("__") and not isinstance(v, bb.data_smart.DataSmart):
dump[k] = {
'v' : v ,
'history' : self.data.varhistory.variable(k),
}
for d in flaglist:
- dump[k][d] = self.data.getVarFlag(k, d)
+ if flags and d in flags:
+ dump[k][d] = flags[d]
+ else:
+ dump[k][d] = None
except Exception as e:
print(e)
return dump
More information about the bitbake-devel
mailing list