[oe-commits] [bitbake] 01/10: cookerdata: Simplify prefiles/postfiles
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 17 09:24:44 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit 8c992c148d9619b10eeae8bbd9376ecf408037a5
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Aug 15 17:57:20 2016 +0100
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 at linuxfoundation.org>
---
lib/bb/cookerdata.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index dc34efe..71021a3 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)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list