diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-23 19:32:20 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-23 19:32:20 +0100 |
commit | eeb65567a0fa6d4cb5140321ffc909da90e363d4 (patch) | |
tree | f25e8b8afeae4b3ae2e92e1b78d4dc0793a1b1e6 /bitbake-dev | |
parent | 60ba2a6a0884f76d1baa02cbf7eda5ce1ef3ab1c (diff) | |
download | openembedded-core-eeb65567a0fa6d4cb5140321ffc909da90e363d4.tar.gz openembedded-core-eeb65567a0fa6d4cb5140321ffc909da90e363d4.tar.bz2 openembedded-core-eeb65567a0fa6d4cb5140321ffc909da90e363d4.tar.xz openembedded-core-eeb65567a0fa6d4cb5140321ffc909da90e363d4.zip |
bitbake-dev: Add taskdata infinite loop fix from upstream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev')
-rw-r--r-- | bitbake-dev/lib/bb/taskdata.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/bitbake-dev/lib/bb/taskdata.py b/bitbake-dev/lib/bb/taskdata.py index 52a4f4e64..73ec2aa75 100644 --- a/bitbake-dev/lib/bb/taskdata.py +++ b/bitbake-dev/lib/bb/taskdata.py @@ -373,11 +373,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))) @@ -425,11 +421,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)) |