summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-06 08:19:42 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-06 08:19:42 +0000
commit4d2a3b6a3d2f6d95f60ac787a990672de69904f5 (patch)
treeacf5ec615e6125ee48e5181ecbba90192f61b427
parentf4337b98030c00bf53ea8cd88ea51a2f091e4ed3 (diff)
downloadpoky-4d2a3b6a3d2f6d95f60ac787a990672de69904f5.tar.gz
bitbake providers.py: Fix message typo and improve debug info
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5416 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake-dev/lib/bb/providers.py5
-rw-r--r--bitbake/lib/bb/providers.py5
2 files changed, 6 insertions, 4 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
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index 3504efc86e..3e842ee0ca 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/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