diff options
| -rw-r--r-- | bitbake/lib/bb/cookerdata.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index dc34efefde..71021a3510 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
| @@ -258,7 +258,7 @@ class CookerDataBuilder(object): | |||
| 258 | 258 | ||
| 259 | def parseBaseConfiguration(self): | 259 | def parseBaseConfiguration(self): |
| 260 | try: | 260 | try: |
| 261 | self.parseConfigurationFiles(self.prefiles, self.postfiles) | 261 | self.parseConfigurationFiles() |
| 262 | except SyntaxError: | 262 | except SyntaxError: |
| 263 | raise bb.BBHandledException | 263 | raise bb.BBHandledException |
| 264 | except bb.data_smart.ExpansionError as e: | 264 | except bb.data_smart.ExpansionError as e: |
| @@ -271,8 +271,10 @@ class CookerDataBuilder(object): | |||
| 271 | def _findLayerConf(self, data): | 271 | def _findLayerConf(self, data): |
| 272 | return findConfigFile("bblayers.conf", data) | 272 | return findConfigFile("bblayers.conf", data) |
| 273 | 273 | ||
| 274 | def parseConfigurationFiles(self, prefiles, postfiles): | 274 | def parseConfigurationFiles(self): |
| 275 | data = self.data | 275 | data = self.data |
| 276 | prefiles = self.prefiles | ||
| 277 | postfiles = self.postfiles | ||
| 276 | bb.parse.init_parser(data) | 278 | bb.parse.init_parser(data) |
| 277 | 279 | ||
| 278 | # Parse files for loading *before* bitbake.conf and any includes | 280 | # Parse files for loading *before* bitbake.conf and any includes |
| @@ -343,7 +345,7 @@ class CookerDataBuilder(object): | |||
| 343 | 345 | ||
| 344 | if data.getVar("BB_INVALIDCONF", False) is True: | 346 | if data.getVar("BB_INVALIDCONF", False) is True: |
| 345 | data.setVar("BB_INVALIDCONF", False) | 347 | data.setVar("BB_INVALIDCONF", False) |
| 346 | self.parseConfigurationFiles(self.prefiles, self.postfiles) | 348 | self.parseConfigurationFiles() |
| 347 | return | 349 | return |
| 348 | 350 | ||
| 349 | bb.parse.init_parser(data) | 351 | bb.parse.init_parser(data) |
