diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 10:41:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:36:53 -0800 |
commit | ff73b02a7203623e5edfaaa10df17eaa63cf4ed3 (patch) | |
tree | d32fbf33c74a0a9c60f3676d1aa46bb6812fa757 /bitbake/lib/bb/providers.py | |
parent | 082cc604f5eb1a7f6d3c4dda01154cfa93b0d660 (diff) | |
download | poky-ff73b02a7203623e5edfaaa10df17eaa63cf4ed3.tar.gz |
meta/classes: Convert to use appendVar and appendVarFlags
(From OE-Core rev: 3b57de68e70e77dbc03c0616a83a29a2e99e40b4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/providers.py')
-rw-r--r-- | bitbake/lib/bb/providers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index 1dc6a8e8bf..bd729df93d 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -284,7 +284,7 @@ def filterProviders(providers, item, cfgData, dataCache): | |||
284 | 284 | ||
285 | eligible = _filterProviders(providers, item, cfgData, dataCache) | 285 | eligible = _filterProviders(providers, item, cfgData, dataCache) |
286 | 286 | ||
287 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % item, 1) | 287 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % item, True) |
288 | if prefervar: | 288 | if prefervar: |
289 | dataCache.preferred[item] = prefervar | 289 | dataCache.preferred[item] = prefervar |
290 | 290 | ||
@@ -322,7 +322,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): | |||
322 | pn = dataCache.pkg_fn[p] | 322 | pn = dataCache.pkg_fn[p] |
323 | provides = dataCache.pn_provides[pn] | 323 | provides = dataCache.pn_provides[pn] |
324 | for provide in provides: | 324 | for provide in provides: |
325 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide, 1) | 325 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide, True) |
326 | logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) | 326 | logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) |
327 | if prefervar in pns and pns[prefervar] not in preferred: | 327 | if prefervar in pns and pns[prefervar] not in preferred: |
328 | var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) | 328 | var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) |