summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-25 14:54:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 16:54:05 +0100
commit5d3538554b73c39f70e03ad2e274b7cdb3aa0de3 (patch)
treef198280e0dfe0d92e64e8da0c6663f9e9e607245
parent965fbe483b9bd875df8839da8d99d671a4ed9fb7 (diff)
downloadpoky-5d3538554b73c39f70e03ad2e274b7cdb3aa0de3.tar.gz
bitbake/providers: list PREFERRED_VERSION candidates when unavailable
If the specified PREFERRED_VERSION is not available then list the available versions in the output. (PR is omitted.) (Bitbake rev: eea5ff9f34bb9b2e29f5fa43deb80d4aa6ef7ddc) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/providers.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index edd54d0c83..22104f1af8 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -124,6 +124,18 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
124 itemstr = " (for item %s)" % item 124 itemstr = " (for item %s)" % item
125 if preferred_file is None: 125 if preferred_file is None:
126 logger.info("preferred version %s of %s not available%s", pv_str, pn, itemstr) 126 logger.info("preferred version %s of %s not available%s", pv_str, pn, itemstr)
127 available_vers = []
128 for file_set in pkg_pn:
129 for f in file_set:
130 pe, pv, pr = dataCache.pkg_pepvpr[f]
131 ver_str = pv
132 if pe:
133 ver_str = "%s:%s" % (pe, ver_str)
134 if not ver_str in available_vers:
135 available_vers.append(ver_str)
136 if available_vers:
137 available_vers.sort()
138 logger.info("versions of %s available: %s", pn, ' '.join(available_vers))
127 else: 139 else:
128 logger.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr) 140 logger.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr)
129 141