diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-22 15:09:07 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-22 15:09:07 +0000 |
| commit | 70141cbcc84f0911edaa7d91de6ba2daa64319cc (patch) | |
| tree | a9d1f52c70aabb503ebbfa3d3b008018aec0403f | |
| parent | 04263dc426f2444d822915257b28393eb8ff6198 (diff) | |
| download | poky-70141cbcc84f0911edaa7d91de6ba2daa64319cc.tar.gz | |
bitbake/providers: Fix merge error
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | bitbake/lib/bb/providers.py | 6 |
1 files changed, 3 insertions, 3 deletions
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): | |||
| 189 | pkg_pn[pn] = [] | 189 | pkg_pn[pn] = [] |
| 190 | pkg_pn[pn].append(p) | 190 | pkg_pn[pn].append(p) |
| 191 | 191 | ||
| 192 | bb.msg.debug(1, bb.msg.domain.Provider, "providers for %s are: %s" % (item, pkg_pn())) | 192 | bb.msg.debug(1, bb.msg.domain.Provider, "providers for %s are: %s" % (item, pkg_pn.keys())) |
| 193 | 193 | ||
| 194 | # First add PREFERRED_VERSIONS | 194 | # First add PREFERRED_VERSIONS |
| 195 | for pn in pkg_pn(): | 195 | for pn in pkg_pn: |
| 196 | sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn) | 196 | sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn) |
| 197 | preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item) | 197 | preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item) |
| 198 | if preferred_versions[pn][1]: | 198 | if preferred_versions[pn][1]: |
| 199 | eligible.append(preferred_versions[pn][1]) | 199 | eligible.append(preferred_versions[pn][1]) |
| 200 | 200 | ||
| 201 | # Now add latest verisons | 201 | # Now add latest verisons |
| 202 | for pn in sortpkg_pn(): | 202 | for pn in sortpkg_pn: |
| 203 | if pn in preferred_versions and preferred_versions[pn][1]: | 203 | if pn in preferred_versions and preferred_versions[pn][1]: |
| 204 | continue | 204 | continue |
| 205 | preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0]) | 205 | preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0]) |
