diff options
Diffstat (limited to 'bitbake-dev/lib/bb/providers.py')
-rw-r--r-- | bitbake-dev/lib/bb/providers.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake-dev/lib/bb/providers.py b/bitbake-dev/lib/bb/providers.py index 3504efc86e..3e842ee0ca 100644 --- a/bitbake-dev/lib/bb/providers.py +++ b/bitbake-dev/lib/bb/providers.py | |||
@@ -260,9 +260,10 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): | |||
260 | pn = dataCache.pkg_fn[p] | 260 | pn = dataCache.pkg_fn[p] |
261 | provides = dataCache.pn_provides[pn] | 261 | provides = dataCache.pn_provides[pn] |
262 | for provide in provides: | 262 | for provide in provides: |
263 | bb.msg.note(2, bb.msg.domain.Provider, "checking PREFERRED_PROVIDER_%s" % (provide)) | ||
263 | prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % provide, cfgData, 1) | 264 | prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % provide, cfgData, 1) |
264 | if prefervar == pn: | 265 | if prefervar == pn: |
265 | var = "PREFERRED_PROVIDERS_%s = %s" % (provide, prefervar) | 266 | var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) |
266 | bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy runtime %s due to %s" % (pn, item, var)) | 267 | bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy runtime %s due to %s" % (pn, item, var)) |
267 | preferred_vars.append(var) | 268 | preferred_vars.append(var) |
268 | eligible.remove(p) | 269 | eligible.remove(p) |
@@ -273,7 +274,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): | |||
273 | numberPreferred = len(preferred) | 274 | numberPreferred = len(preferred) |
274 | 275 | ||
275 | if numberPreferred > 1: | 276 | if numberPreferred > 1: |
276 | bb.msg.error(bb.msg.domain.Provider, "Conflicting PREFERRED_PROVIDERS entries were found which resulted in an attempt to select multiple providers (%s) for runtime dependecy %s\nThe entries resulting in this conflict were: %s" % (preferred, item, preferred_vars)) | 277 | bb.msg.error(bb.msg.domain.Provider, "Conflicting PREFERRED_PROVIDER entries were found which resulted in an attempt to select multiple providers (%s) for runtime dependecy %s\nThe entries resulting in this conflict were: %s" % (preferred, item, preferred_vars)) |
277 | 278 | ||
278 | bb.msg.debug(1, bb.msg.domain.Provider, "sorted providers for %s are: %s" % (item, eligible)) | 279 | bb.msg.debug(1, bb.msg.domain.Provider, "sorted providers for %s are: %s" % (item, eligible)) |
279 | 280 | ||