From 7e85adc023d03c87b90e66a8c58f1f2105287d4b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 May 2013 15:26:03 +0000 Subject: [PATCH] bitbake: cooker: Rename confusing buildDepgraph task to handlePrefProviders (Bitbake rev: a25722175bf61f22961f45dbd356cb6d79864b35) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 308def0..2b55617 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -712,7 +712,7 @@ class BBCooker: else: bb.fatal(msg) - def buildDepgraph( self ): + def handlePrefProviders(self): localdata = data.createCopy(self.configuration.data) bb.data.update_data(localdata) @@ -729,8 +729,6 @@ class BBCooker: providerlog.error("conflicting preferences for %s: both %s and %s specified", providee, provider, self.status.preferred[providee]) self.status.preferred[providee] = provider - self.status.bbfile_priority = self.collection.collection_priorities(self.status.pkg_fn) - def findCoreBaseFiles(self, subdir, configfile): corebase = self.configuration.data.getVar('COREBASE', True) or "" paths = [] @@ -1299,7 +1297,8 @@ class BBCooker: if self.parser.error: sys.exit(1) self.show_appends_with_no_recipes() - self.buildDepgraph() + self.handlePrefProviders() + self.status.bbfile_priority = self.collection.collection_priorities(self.status.pkg_fn) self.state = state.running return None -- 2.7.4