From a46fac74c3372cfcd1cb639c058bd416d0ea3b64 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 21 Aug 2012 18:11:45 +0100 Subject: bitbake: bitbake/cooker: minor refactor of parseConfiguration() All calls to parseConfiguration set self.status and call self.handleCollections() afterwards, so just do this inside parseConfiguration() itself. (Bitbake rev: 3c2322d8a6ce15e20adb07a61aa321d884a9bcca) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 23fffc97bc..1737e548cf 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -219,6 +219,12 @@ class BBCooker: nice = int(nice) - curnice buildlog.verbose("Renice to %s " % os.nice(nice)) + if self.status: + del self.status + self.status = bb.cache.CacheData(self.caches_array) + + self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", True) ) + def parseCommandLine(self): # Parse any commandline into actions self.commandlineAction = {'action':None, 'msg':None} @@ -298,8 +304,6 @@ class BBCooker: # Parse the configuration here. We need to do it explicitly here since # this showEnvironment() code path doesn't use the cache self.parseConfiguration() - self.status = bb.cache.CacheData(self.caches_array) - self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", True) ) fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile) fn = self.matchFile(fn) @@ -1035,8 +1039,6 @@ class BBCooker: # Parse the configuration here. We need to do it explicitly here since # buildFile() doesn't use the cache self.parseConfiguration() - self.status = bb.cache.CacheData(self.caches_array) - self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", True) ) # If we are told to do the None task then query the default task if (task == None): @@ -1186,18 +1188,12 @@ class BBCooker: if self.state != state.parsing: self.parseConfiguration () - if self.status: - del self.status - self.status = bb.cache.CacheData(self.caches_array) - ignore = self.configuration.data.getVar("ASSUME_PROVIDED", True) or "" self.status.ignored_dependencies = set(ignore.split()) for dep in self.configuration.extra_assume_provided: self.status.ignored_dependencies.add(dep) - self.handleCollections( self.configuration.data.getVar("BBFILE_COLLECTIONS", True) ) - (filelist, masked) = self.collect_bbfiles() self.configuration.data.renameVar("__depends", "__base_depends") -- cgit v1.2.3-54-g00ecf