]> code.ossystems Code Review - openembedded-core.git/commitdiff
bitbake/providers: Fix merge error
authorRichard Purdie <rpurdie@linux.intel.com>
Mon, 22 Mar 2010 15:09:07 +0000 (15:09 +0000)
committerRichard Purdie <rpurdie@linux.intel.com>
Mon, 22 Mar 2010 15:09:07 +0000 (15:09 +0000)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
bitbake/lib/bb/providers.py

index c9fe7c7d7fb15ba99c65ed0345806d4a0e860053..c75936e3b249619a396c992f3b5feac60ace2fa8 100644 (file)
@@ -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])