diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:09 +0000 |
commit | ddaac5e4e3ebe71cb279a33a6585b3e8a8790e55 (patch) | |
tree | 5dc9c0d3e1da1edacad1e6b8748c4db22026f011 /bitbake/lib/bb/data_smart.py | |
parent | 1fce7ecbbb004a5ad82da3eef79cfd52b276708d (diff) | |
download | poky-ddaac5e4e3ebe71cb279a33a6585b3e8a8790e55.tar.gz |
bitbake: bitbake: remove True option to getVarFlag calls
getVarFlag() now defaults to expanding by default, thus remove the
True option from getVarFlag() calls with a regex search and
replace.
Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)
(Bitbake rev: c19baa8c19ea8ab9b9b64fd30298d8764c6fd2cd)
Signed-off-by: Joshua Lock <joshua.g.lock@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 | 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 482399a95d..be43eb9be3 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -108,7 +108,7 @@ class VariableParse: | |||
108 | varparse = self.d.expand_cache[key] | 108 | varparse = self.d.expand_cache[key] |
109 | var = varparse.value | 109 | var = varparse.value |
110 | else: | 110 | else: |
111 | var = self.d.getVarFlag(key, "_content", True) | 111 | var = self.d.getVarFlag(key, "_content") |
112 | self.references.add(key) | 112 | self.references.add(key) |
113 | if var is not None: | 113 | if var is not None: |
114 | return var | 114 | return var |
@@ -122,7 +122,7 @@ class VariableParse: | |||
122 | parser = bb.codeparser.PythonParser(self.varname, logger) | 122 | parser = bb.codeparser.PythonParser(self.varname, logger) |
123 | parser.parse_python(code) | 123 | parser.parse_python(code) |
124 | if self.varname: | 124 | if self.varname: |
125 | vardeps = self.d.getVarFlag(self.varname, "vardeps", True) | 125 | vardeps = self.d.getVarFlag(self.varname, "vardeps") |
126 | if vardeps is None: | 126 | if vardeps is None: |
127 | parser.log.flush() | 127 | parser.log.flush() |
128 | else: | 128 | else: |