From 249686927ba7c1149298c2efd0645993a5dd74c5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 15 Aug 2016 17:57:20 +0100 Subject: [PATCH] bitbake: 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. (Bitbake rev: 8c992c148d9619b10eeae8bbd9376ecf408037a5) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cookerdata.py | 8 +++++--- 1 file 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): 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)