From: Richard Purdie Date: Mon, 22 Mar 2010 15:09:07 +0000 (+0000) Subject: bitbake/providers: Fix merge error X-Git-Tag: 2011-1~6120 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=70141cbcc84f0911edaa7d91de6ba2daa64319cc;p=openembedded-core.git bitbake/providers: Fix merge error Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index c9fe7c7d7f..c75936e3b2 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])