summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/providers.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/providers.py')
-rw-r--r--bitbake/lib/bb/providers.py28
1 files changed, 0 insertions, 28 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index cb0ca3ff24..0ad5876ef0 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -213,34 +213,6 @@ def _filterProviders(providers, item, cfgData, dataCache):
213 eligible.remove(fn) 213 eligible.remove(fn)
214 eligible = [fn] + eligible 214 eligible = [fn] + eligible
215 215
216 # look to see if one of them is already staged, or marked as preferred.
217 # if so, bump it to the head of the queue
218 for p in providers:
219 pn = dataCache.pkg_fn[p]
220 pe, pv, pr = dataCache.pkg_pepvpr[p]
221
222 stamp = '%s.do_populate_staging' % dataCache.stamp[p]
223 if os.path.exists(stamp):
224 (newvers, fn) = preferred_versions[pn]
225 if not fn in eligible:
226 # package was made ineligible by already-failed check
227 continue
228 oldver = "%s-%s" % (pv, pr)
229 if pe > 0:
230 oldver = "%s:%s" % (pe, oldver)
231 newver = "%s-%s" % (newvers[1], newvers[2])
232 if newvers[0] > 0:
233 newver = "%s:%s" % (newvers[0], newver)
234 if (newver != oldver):
235 extra_chat = "%s (%s) already staged but upgrading to %s to satisfy %s" % (pn, oldver, newver, item)
236 else:
237 extra_chat = "Selecting already-staged %s (%s) to satisfy %s" % (pn, oldver, item)
238
239 bb.msg.note(2, bb.msg.domain.Provider, "%s" % extra_chat)
240 eligible.remove(fn)
241 eligible = [fn] + eligible
242 break
243
244 return eligible 216 return eligible
245 217
246 218