diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:09 +0000 |
commit | 1fce7ecbbb004a5ad82da3eef79cfd52b276708d (patch) | |
tree | dc19c8ecb8e0b04ba5eafd27a7679bb55585a868 /bitbake/lib/bblayers/layerindex.py | |
parent | 1d0c124cdf0282b8d139063409e40982f0ec9888 (diff) | |
download | poky-1fce7ecbbb004a5ad82da3eef79cfd52b276708d.tar.gz |
bitbake: bitbake: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(Bitbake rev: 3b45c479de8640f92dd1d9f147b02e1eecfaadc8)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bblayers/layerindex.py')
-rw-r--r-- | bitbake/lib/bblayers/layerindex.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bblayers/layerindex.py b/bitbake/lib/bblayers/layerindex.py index 10ad718eba..013e952f38 100644 --- a/bitbake/lib/bblayers/layerindex.py +++ b/bitbake/lib/bblayers/layerindex.py | |||
@@ -151,7 +151,7 @@ class LayerIndexPlugin(ActionPlugin): | |||
151 | def do_layerindex_fetch(self, args): | 151 | def do_layerindex_fetch(self, args): |
152 | """Fetches a layer from a layer index along with its dependent layers, and adds them to conf/bblayers.conf. | 152 | """Fetches a layer from a layer index along with its dependent layers, and adds them to conf/bblayers.conf. |
153 | """ | 153 | """ |
154 | apiurl = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_URL', True) | 154 | apiurl = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_URL') |
155 | if not apiurl: | 155 | if not apiurl: |
156 | logger.error("Cannot get BBLAYERS_LAYERINDEX_URL") | 156 | logger.error("Cannot get BBLAYERS_LAYERINDEX_URL") |
157 | return 1 | 157 | return 1 |
@@ -173,8 +173,8 @@ class LayerIndexPlugin(ActionPlugin): | |||
173 | return 1 | 173 | return 1 |
174 | 174 | ||
175 | ignore_layers = [] | 175 | ignore_layers = [] |
176 | for collection in self.tinfoil.config_data.getVar('BBFILE_COLLECTIONS', True).split(): | 176 | for collection in self.tinfoil.config_data.getVar('BBFILE_COLLECTIONS').split(): |
177 | lname = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_NAME_%s' % collection, True) | 177 | lname = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_NAME_%s' % collection) |
178 | if lname: | 178 | if lname: |
179 | ignore_layers.append(lname) | 179 | ignore_layers.append(lname) |
180 | 180 | ||
@@ -225,7 +225,7 @@ class LayerIndexPlugin(ActionPlugin): | |||
225 | printedlayers.append(dependency) | 225 | printedlayers.append(dependency) |
226 | 226 | ||
227 | if repourls: | 227 | if repourls: |
228 | fetchdir = self.tinfoil.config_data.getVar('BBLAYERS_FETCH_DIR', True) | 228 | fetchdir = self.tinfoil.config_data.getVar('BBLAYERS_FETCH_DIR') |
229 | if not fetchdir: | 229 | if not fetchdir: |
230 | logger.error("Cannot get BBLAYERS_FETCH_DIR") | 230 | logger.error("Cannot get BBLAYERS_FETCH_DIR") |
231 | return 1 | 231 | return 1 |