mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake/providers: Fix merge error

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-03-22 15:09:07 +00:00
parent 04263dc426
commit 70141cbcc8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/providers.py
+3 -3
View File
@@ -189,17 +189,17 @@ def _filterProviders(providers, item, cfgData, dataCache):
pkg_pn[pn] = [] pkg_pn[pn] = []
pkg_pn[pn].append(p) 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 # First add PREFERRED_VERSIONS
for pn in pkg_pn(): for pn in pkg_pn:
sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn) sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn)
preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item) preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item)
if preferred_versions[pn][1]: if preferred_versions[pn][1]:
eligible.append(preferred_versions[pn][1]) eligible.append(preferred_versions[pn][1])
# Now add latest verisons # Now add latest verisons
for pn in sortpkg_pn(): for pn in sortpkg_pn:
if pn in preferred_versions and preferred_versions[pn][1]: if pn in preferred_versions and preferred_versions[pn][1]:
continue continue
preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0]) preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0])