diff options
Diffstat (limited to 'bitbake/lib/bb/providers.py')
-rw-r--r-- | bitbake/lib/bb/providers.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index 3f66a3d99f..0c87dfd4bc 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -165,7 +165,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
165 | available_vers.sort() | 165 | available_vers.sort() |
166 | logger.warn("versions of %s available: %s", pn, ' '.join(available_vers)) | 166 | logger.warn("versions of %s available: %s", pn, ' '.join(available_vers)) |
167 | else: | 167 | else: |
168 | logger.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr) | 168 | logger.debug("selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr) |
169 | 169 | ||
170 | return (preferred_ver, preferred_file) | 170 | return (preferred_ver, preferred_file) |
171 | 171 | ||
@@ -232,7 +232,7 @@ def _filterProviders(providers, item, cfgData, dataCache): | |||
232 | pkg_pn[pn] = [] | 232 | pkg_pn[pn] = [] |
233 | pkg_pn[pn].append(p) | 233 | pkg_pn[pn].append(p) |
234 | 234 | ||
235 | logger.debug(1, "providers for %s are: %s", item, list(sorted(pkg_pn.keys()))) | 235 | logger.debug("providers for %s are: %s", item, list(sorted(pkg_pn.keys()))) |
236 | 236 | ||
237 | # First add PREFERRED_VERSIONS | 237 | # First add PREFERRED_VERSIONS |
238 | for pn in sorted(pkg_pn): | 238 | for pn in sorted(pkg_pn): |
@@ -291,7 +291,7 @@ def filterProviders(providers, item, cfgData, dataCache): | |||
291 | foundUnique = True | 291 | foundUnique = True |
292 | break | 292 | break |
293 | 293 | ||
294 | logger.debug(1, "sorted providers for %s are: %s", item, eligible) | 294 | logger.debug("sorted providers for %s are: %s", item, eligible) |
295 | 295 | ||
296 | return eligible, foundUnique | 296 | return eligible, foundUnique |
297 | 297 | ||
@@ -333,7 +333,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): | |||
333 | provides = dataCache.pn_provides[pn] | 333 | provides = dataCache.pn_provides[pn] |
334 | for provide in provides: | 334 | for provide in provides: |
335 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide) | 335 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide) |
336 | #logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) | 336 | #logger.debug("checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) |
337 | if prefervar in pns and pns[prefervar] not in preferred: | 337 | if prefervar in pns and pns[prefervar] not in preferred: |
338 | var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) | 338 | var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) |
339 | logger.verbose("selecting %s to satisfy runtime %s due to %s", prefervar, item, var) | 339 | logger.verbose("selecting %s to satisfy runtime %s due to %s", prefervar, item, var) |
@@ -349,7 +349,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): | |||
349 | if numberPreferred > 1: | 349 | if numberPreferred > 1: |
350 | logger.error("Trying to resolve runtime dependency %s resulted in conflicting PREFERRED_PROVIDER entries being found.\nThe providers found were: %s\nThe PREFERRED_PROVIDER entries resulting in this conflict were: %s. You could set PREFERRED_RPROVIDER_%s" % (item, preferred, preferred_vars, item)) | 350 | logger.error("Trying to resolve runtime dependency %s resulted in conflicting PREFERRED_PROVIDER entries being found.\nThe providers found were: %s\nThe PREFERRED_PROVIDER entries resulting in this conflict were: %s. You could set PREFERRED_RPROVIDER_%s" % (item, preferred, preferred_vars, item)) |
351 | 351 | ||
352 | logger.debug(1, "sorted runtime providers for %s are: %s", item, eligible) | 352 | logger.debug("sorted runtime providers for %s are: %s", item, eligible) |
353 | 353 | ||
354 | return eligible, numberPreferred | 354 | return eligible, numberPreferred |
355 | 355 | ||
@@ -384,7 +384,7 @@ def getRuntimeProviders(dataCache, rdepend): | |||
384 | regexp_cache[pattern] = regexp | 384 | regexp_cache[pattern] = regexp |
385 | if regexp.match(rdepend): | 385 | if regexp.match(rdepend): |
386 | rproviders += dataCache.packages_dynamic[pattern] | 386 | rproviders += dataCache.packages_dynamic[pattern] |
387 | logger.debug(1, "Assuming %s is a dynamic package, but it may not exist" % rdepend) | 387 | logger.debug("Assuming %s is a dynamic package, but it may not exist" % rdepend) |
388 | 388 | ||
389 | return rproviders | 389 | return rproviders |
390 | 390 | ||
@@ -396,22 +396,22 @@ def buildWorldTargetList(dataCache, task=None): | |||
396 | if dataCache.world_target: | 396 | if dataCache.world_target: |
397 | return | 397 | return |
398 | 398 | ||
399 | logger.debug(1, "collating packages for \"world\"") | 399 | logger.debug("collating packages for \"world\"") |
400 | for f in dataCache.possible_world: | 400 | for f in dataCache.possible_world: |
401 | terminal = True | 401 | terminal = True |
402 | pn = dataCache.pkg_fn[f] | 402 | pn = dataCache.pkg_fn[f] |
403 | if task and task not in dataCache.task_deps[f]['tasks']: | 403 | if task and task not in dataCache.task_deps[f]['tasks']: |
404 | logger.debug(2, "World build skipping %s as task %s doesn't exist", f, task) | 404 | logger.debug2("World build skipping %s as task %s doesn't exist", f, task) |
405 | terminal = False | 405 | terminal = False |
406 | 406 | ||
407 | for p in dataCache.pn_provides[pn]: | 407 | for p in dataCache.pn_provides[pn]: |
408 | if p.startswith('virtual/'): | 408 | if p.startswith('virtual/'): |
409 | logger.debug(2, "World build skipping %s due to %s provider starting with virtual/", f, p) | 409 | logger.debug2("World build skipping %s due to %s provider starting with virtual/", f, p) |
410 | terminal = False | 410 | terminal = False |
411 | break | 411 | break |
412 | for pf in dataCache.providers[p]: | 412 | for pf in dataCache.providers[p]: |
413 | if dataCache.pkg_fn[pf] != pn: | 413 | if dataCache.pkg_fn[pf] != pn: |
414 | logger.debug(2, "World build skipping %s due to both us and %s providing %s", f, pf, p) | 414 | logger.debug2("World build skipping %s due to both us and %s providing %s", f, pf, p) |
415 | terminal = False | 415 | terminal = False |
416 | break | 416 | break |
417 | if terminal: | 417 | if terminal: |