diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-12-13 20:07:09 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-14 12:25:07 +0000 |
commit | 8f8a9ef66930ef8375050e80c751dab5ba024d83 (patch) | |
tree | 5aff939bf2af2f18a1c07c24315ae57c99720d9b /bitbake/lib/bb/data_smart.py | |
parent | f1f3a112a02aef2e7094b4700c9a7d341ee01275 (diff) | |
download | poky-8f8a9ef66930ef8375050e80c751dab5ba024d83.tar.gz |
bitbake: 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).
(Bitbake rev: cbc22a0a9aadc8606b927dbac0f1407ec2736b35)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/data_smart.py')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 5d0ed12d6e..4d0a771283 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -123,7 +123,7 @@ class VariableParse: | |||
123 | 123 | ||
124 | if "_remote_data" in self.d: | 124 | if "_remote_data" in self.d: |
125 | connector = self.d["_remote_data"] | 125 | connector = self.d["_remote_data"] |
126 | return connector.expandPythonRef(self.varname, code) | 126 | return connector.expandPythonRef(self.varname, code, self.d) |
127 | 127 | ||
128 | codeobj = compile(code.strip(), self.varname or "<expansion>", "eval") | 128 | codeobj = compile(code.strip(), self.varname or "<expansion>", "eval") |
129 | 129 | ||