From 483f85802a97cb9ad4d958c29458db91acc7809f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 3 Nov 2009 23:20:15 +0000 Subject: bitbake: Sync various functions with those from bitbake-dev and bitbake upstream Signed-off-by: Richard Purdie --- bitbake/lib/bb/taskdata.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'bitbake/lib/bb/taskdata.py') diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 64ab032c3c..45f6902ddd 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py @@ -374,11 +374,7 @@ class TaskData: all_p = dataCache.providers[item] eligible, foundUnique = bb.providers.filterProviders(all_p, item, cfgData, dataCache) - - for p in eligible: - fnid = self.getfn_id(p) - if fnid in self.failed_fnids: - eligible.remove(p) + eligible = [p for p in eligible if not self.getfn_id(p) in self.failed_fnids] if not eligible: bb.msg.note(2, bb.msg.domain.Provider, "No buildable provider PROVIDES '%s' but '%s' DEPENDS on or otherwise requires it. Enable debugging and see earlier logs to find unbuildable providers." % (item, self.get_dependees_str(item))) @@ -426,11 +422,7 @@ class TaskData: raise bb.providers.NoRProvider(item) eligible, numberPreferred = bb.providers.filterProvidersRunTime(all_p, item, cfgData, dataCache) - - for p in eligible: - fnid = self.getfn_id(p) - if fnid in self.failed_fnids: - eligible.remove(p) + eligible = [p for p in eligible if not self.getfn_id(p) in self.failed_fnids] if not eligible: bb.msg.error(bb.msg.domain.Provider, "'%s' RDEPENDS/RRECOMMENDS or otherwise requires the runtime entity '%s' but it wasn't found in any PACKAGE or RPROVIDES variables of any buildable targets.\nEnable debugging and see earlier logs to find unbuildable targets." % (self.get_rdependees_str(item), item)) -- cgit v1.2.3-54-g00ecf