diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-16 11:20:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 10:59:56 +0000 |
commit | 2631c375b8a025ee2e4329f6d93900bb7b5dadf7 (patch) | |
tree | 3ff8ccd117d2c5437a9d8d4709a77e2a63ff7111 /bitbake/lib | |
parent | 30205c7148b86475892720a647163fe2b4a2e009 (diff) | |
download | poky-2631c375b8a025ee2e4329f6d93900bb7b5dadf7.tar.gz |
bitbake: data_smart: Default to expansion for getVar/getVarFlags
We've been building to this for a while, default to return expanded
values for getVar/getVarFlags.
We can then go through and remove the "True" option to many of the
calls to this function, all function calls should have a default by now
though since the parameter has been required for a while.
(Bitbake rev: caf5bb9b7fe254bca9da077ebcb84a37d1f96dd4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index f100446dcc..cd3853e736 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -565,7 +565,7 @@ class DataSmart(MutableMapping): | |||
565 | if len(shortvar) == 0: | 565 | if len(shortvar) == 0: |
566 | override = None | 566 | override = None |
567 | 567 | ||
568 | def getVar(self, var, expand, noweakdefault=False, parsing=False): | 568 | def getVar(self, var, expand=True, noweakdefault=False, parsing=False): |
569 | return self.getVarFlag(var, "_content", expand, noweakdefault, parsing) | 569 | return self.getVarFlag(var, "_content", expand, noweakdefault, parsing) |
570 | 570 | ||
571 | def renameVar(self, key, newkey, **loginfo): | 571 | def renameVar(self, key, newkey, **loginfo): |
@@ -662,7 +662,7 @@ class DataSmart(MutableMapping): | |||
662 | self.dict["__exportlist"]["_content"] = set() | 662 | self.dict["__exportlist"]["_content"] = set() |
663 | self.dict["__exportlist"]["_content"].add(var) | 663 | self.dict["__exportlist"]["_content"].add(var) |
664 | 664 | ||
665 | def getVarFlag(self, var, flag, expand, noweakdefault=False, parsing=False): | 665 | def getVarFlag(self, var, flag, expand=True, noweakdefault=False, parsing=False): |
666 | local_var = self._findVar(var) | 666 | local_var = self._findVar(var) |
667 | value = None | 667 | value = None |
668 | if flag == "_content" and var in self.overridedata and not parsing: | 668 | if flag == "_content" and var in self.overridedata and not parsing: |