aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bb/data_smart.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-13 20:07:09 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-14 09:54:48 +0000
commitcbc22a0a9aadc8606b927dbac0f1407ec2736b35 (patch)
tree7c822da36f9709049addab3e83be6beb74267e88 /lib/bb/data_smart.py
parent8f635815d191c9d848a92d51fdbf5e9fd3da1727 (diff)
downloadbitbake-cbc22a0a9aadc8606b927dbac0f1407ec2736b35.tar.gz
tinfoil: pass datastore to server when expanding python references
If you're expanding a value that refers to the value of a variable in python code, we need to ensure that the datastore that gets used to get the value of that variable is the client-side datastore and not just the part of it that's on the server side. For example, suppose you are in client code doing the following: d.setVar('HELLO', 'there') result = d.expand('${@d.getVar("HELLO", True)}') result should be "there" but if the client part wasn't taken into account, it would be whatever value HELLO had in the server portion of the datastore (if any). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/data_smart.py')
-rw-r--r--lib/bb/data_smart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 5d0ed12d6..4d0a77128 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -123,7 +123,7 @@ class VariableParse:
if "_remote_data" in self.d:
connector = self.d["_remote_data"]
- return connector.expandPythonRef(self.varname, code)
+ return connector.expandPythonRef(self.varname, code, self.d)
codeobj = compile(code.strip(), self.varname or "<expansion>", "eval")