summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-03-22 15:09:07 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-22 15:09:07 +0000
commit70141cbcc84f0911edaa7d91de6ba2daa64319cc (patch)
treea9d1f52c70aabb503ebbfa3d3b008018aec0403f /bitbake/lib/bb
parent04263dc426f2444d822915257b28393eb8ff6198 (diff)
downloadopenembedded-core-70141cbcc84f0911edaa7d91de6ba2daa64319cc.tar.gz
openembedded-core-70141cbcc84f0911edaa7d91de6ba2daa64319cc.tar.bz2
openembedded-core-70141cbcc84f0911edaa7d91de6ba2daa64319cc.tar.xz
openembedded-core-70141cbcc84f0911edaa7d91de6ba2daa64319cc.zip
bitbake/providers: Fix merge error
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/providers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index c9fe7c7d7..c75936e3b 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -189,17 +189,17 @@ def _filterProviders(providers, item, cfgData, dataCache):
pkg_pn[pn] = []
pkg_pn[pn].append(p)
- bb.msg.debug(1, bb.msg.domain.Provider, "providers for %s are: %s" % (item, pkg_pn()))
+ bb.msg.debug(1, bb.msg.domain.Provider, "providers for %s are: %s" % (item, pkg_pn.keys()))
# First add PREFERRED_VERSIONS
- for pn in pkg_pn():
+ for pn in pkg_pn:
sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn)
preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item)
if preferred_versions[pn][1]:
eligible.append(preferred_versions[pn][1])
# Now add latest verisons
- for pn in sortpkg_pn():
+ for pn in sortpkg_pn:
if pn in preferred_versions and preferred_versions[pn][1]:
continue
preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0])