diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-15 17:57:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-17 10:23:01 +0100 |
commit | 8c992c148d9619b10eeae8bbd9376ecf408037a5 (patch) | |
tree | 8c6671f427c9031ddec21236c73ab93521dab78b /lib/bb/cookerdata.py | |
parent | 28bb8ef7f737034055f3485795179cfdcdb9a41f (diff) | |
download | bitbake-8c992c148d9619b10eeae8bbd9376ecf408037a5.tar.gz |
cookerdata: Simplify prefiles/postfiles
The current codepaths are rather confusing. Stop passing these
as parameters and use the ones from when the object is created.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/cookerdata.py')
-rw-r--r-- | lib/bb/cookerdata.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py index dc34efefd..71021a351 100644 --- a/lib/bb/cookerdata.py +++ b/lib/bb/cookerdata.py @@ -258,7 +258,7 @@ class CookerDataBuilder(object): def parseBaseConfiguration(self): try: - self.parseConfigurationFiles(self.prefiles, self.postfiles) + self.parseConfigurationFiles() except SyntaxError: raise bb.BBHandledException except bb.data_smart.ExpansionError as e: @@ -271,8 +271,10 @@ class CookerDataBuilder(object): def _findLayerConf(self, data): return findConfigFile("bblayers.conf", data) - def parseConfigurationFiles(self, prefiles, postfiles): + def parseConfigurationFiles(self): data = self.data + prefiles = self.prefiles + postfiles = self.postfiles bb.parse.init_parser(data) # Parse files for loading *before* bitbake.conf and any includes @@ -343,7 +345,7 @@ class CookerDataBuilder(object): if data.getVar("BB_INVALIDCONF", False) is True: data.setVar("BB_INVALIDCONF", False) - self.parseConfigurationFiles(self.prefiles, self.postfiles) + self.parseConfigurationFiles() return bb.parse.init_parser(data) |