diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2008-05-04 22:58:17 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-05-04 22:58:17 +0000 |
| commit | e9bf48c6c049dc58878e53c9d0f1f8e6fb856ea0 (patch) | |
| tree | bb488ae9199ff0508d2f1247f783c0ff5fab4985 | |
| parent | d9d3da757fa395472728c5cf3cab3bdc27b3448b (diff) | |
| download | bitbake-contrib-e9bf48c6c049dc58878e53c9d0f1f8e6fb856ea0.tar.gz | |
providers.py: Improve runtime PREFERRED_PROVIDERS warning messages to be more user friendly
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | lib/bb/providers.py | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -125,7 +125,8 @@ Changes in Bitbake 1.9.x: - Work around refs/HEAD issues with git over http (#3410) - Add proxy support to the CVS fetcher (from Cyril Chemparathy) - Improve runfetchcmd so errors are seen and various GIT variables are exported - - Add ability to fetchers to check URL validity without downloading + - Add ability to fetchers to check URL validity without downloading + - Improve runtime PREFERRED_PROVIDERS warning message Changes in Bitbake 1.8.0: - Release 1.7.x as a stable series diff --git a/lib/bb/providers.py b/lib/bb/providers.py index 2f6b620b3..cb0ca3ff2 100644 --- a/lib/bb/providers.py +++ b/lib/bb/providers.py @@ -283,13 +283,16 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): # Should use dataCache.preferred here? preferred = [] + preferred_vars = [] for p in eligible: pn = dataCache.pkg_fn[p] provides = dataCache.pn_provides[pn] for provide in provides: prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % provide, cfgData, 1) if prefervar == pn: - bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy runtime %s due to PREFERRED_PROVIDERS" % (pn, item)) + var = "PREFERRED_PROVIDERS_%s = %s" % (provide, prefervar) + bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy runtime %s due to %s" % (pn, item, var)) + preferred_vars.append(var) eligible.remove(p) eligible = [p] + eligible preferred.append(p) @@ -297,6 +300,9 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): numberPreferred = len(preferred) + if numberPreferred > 1: + 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)) + bb.msg.debug(1, bb.msg.domain.Provider, "sorted providers for %s are: %s" % (item, eligible)) return eligible, numberPreferred |