MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake: logging: Make bitbake logger compatible with python logger

Browse Source 
The bitbake logger overrode the definition of the debug() logging call
to include a debug level, but this causes problems with code that may
be using standard python logging, since the extra argument is
interpreted differently.

Instead, change the bitbake loggers debug() call to match the python
logger call and add a debug2() and debug3() API to replace calls that
were logging to a different debug level.

[RP: Small fix to ensure bb.debug calls bbdebug()]
(Bitbake rev: f68682a79d83e6399eb403f30a1f113516575f51)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt 2021-02-09 09:50:21 -06:00 committed by Richard Purdie
parent 7283a0b3b6
commit 75f87db413
34 changed files with 237 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/bin/bitbake-worker
View File

@ -169,7 +169,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha
fakedirs = (workerdata["fakerootdirs"][fn] or "").split() fakedirs = (workerdata["fakerootdirs"][fn] or "").split()
for p in fakedirs: for p in fakedirs:
bb.utils.mkdirhier(p) bb.utils.mkdirhier(p)
logger.debug(2, 'Running %s:%s under fakeroot, fakedirs: %s' % logger.debug2('Running %s:%s under fakeroot, fakedirs: %s' %
(fn, taskname, ', '.join(fakedirs))) (fn, taskname, ', '.join(fakedirs)))
else: else:
envvars = (workerdata["fakerootnoenv"][fn] or "").split() envvars = (workerdata["fakerootnoenv"][fn] or "").split()

13
bitbake/lib/bb/__init__.py
View File

@ -42,7 +42,16 @@ class BBLoggerMixin(object):
def setup_bblogger(self, name): def setup_bblogger(self, name):
if name.split(".")[0] == "BitBake": if name.split(".")[0] == "BitBake":
self.debug = self.bbdebug self.debug = self._debug_helper
def _debug_helper(self, *args, **kwargs):
return self.bbdebug(1, *args, **kwargs)
def debug2(self, *args, **kwargs):
return self.bbdebug(2, *args, **kwargs)
def debug3(self, *args, **kwargs):
return self.bbdebug(3, *args, **kwargs)
def bbdebug(self, level, msg, *args, **kwargs): def bbdebug(self, level, msg, *args, **kwargs):
loglevel = logging.DEBUG - level + 1 loglevel = logging.DEBUG - level + 1
@ -128,7 +137,7 @@ def debug(lvl, *args):
mainlogger.warning("Passed invalid debug level '%s' to bb.debug", lvl) mainlogger.warning("Passed invalid debug level '%s' to bb.debug", lvl)
args = (lvl,) + args args = (lvl,) + args
lvl = 1 lvl = 1
mainlogger.debug(lvl, ''.join(args)) mainlogger.bbdebug(lvl, ''.join(args))
def note(*args): def note(*args):
mainlogger.info(''.join(args)) mainlogger.info(''.join(args))

6
bitbake/lib/bb/build.py
View File

@ -583,7 +583,7 @@ def _exec_task(fn, task, d, quieterr):
logger.error("No such task: %s" % task) logger.error("No such task: %s" % task)
return 1 return 1
logger.debug(1, "Executing task %s", task) logger.debug("Executing task %s", task)
localdata = _task_data(fn, task, d) localdata = _task_data(fn, task, d)
tempdir = localdata.getVar('T') tempdir = localdata.getVar('T')
@ -596,7 +596,7 @@ def _exec_task(fn, task, d, quieterr):
curnice = os.nice(0) curnice = os.nice(0)
nice = int(nice) - curnice nice = int(nice) - curnice
newnice = os.nice(nice) newnice = os.nice(nice)
logger.debug(1, "Renice to %s " % newnice) logger.debug("Renice to %s " % newnice)
ionice = localdata.getVar("BB_TASK_IONICE_LEVEL") ionice = localdata.getVar("BB_TASK_IONICE_LEVEL")
if ionice: if ionice:
try: try:
@ -720,7 +720,7 @@ def _exec_task(fn, task, d, quieterr):
logfile.close() logfile.close()
if os.path.exists(logfn) and os.path.getsize(logfn) == 0: if os.path.exists(logfn) and os.path.getsize(logfn) == 0:
logger.debug(2, "Zero size logfn %s, removing", logfn) logger.debug2("Zero size logfn %s, removing", logfn)
bb.utils.remove(logfn) bb.utils.remove(logfn)
bb.utils.remove(loglink) bb.utils.remove(loglink)
event.fire(TaskSucceeded(task, fn, logfn, localdata), localdata) event.fire(TaskSucceeded(task, fn, logfn, localdata), localdata)

52
bitbake/lib/bb/cache.py
View File

@ -215,7 +215,7 @@ class CoreRecipeInfo(RecipeInfoCommon):
if not self.not_world: if not self.not_world:
cachedata.possible_world.append(fn) cachedata.possible_world.append(fn)
#else: #else:
# logger.debug(2, "EXCLUDE FROM WORLD: %s", fn) # logger.debug2("EXCLUDE FROM WORLD: %s", fn)
# create a collection of all targets for sanity checking # create a collection of all targets for sanity checking
# tasks, such as upstream versions, license, and tools for # tasks, such as upstream versions, license, and tools for
@ -323,7 +323,7 @@ class NoCache(object):
Return a complete set of data for fn. Return a complete set of data for fn.
To do this, we need to parse the file. To do this, we need to parse the file.
""" """
logger.debug(1, "Parsing %s (full)" % virtualfn) logger.debug("Parsing %s (full)" % virtualfn)
(fn, virtual, mc) = virtualfn2realfn(virtualfn) (fn, virtual, mc) = virtualfn2realfn(virtualfn)
bb_data = self.load_bbfile(virtualfn, appends, virtonly=True) bb_data = self.load_bbfile(virtualfn, appends, virtonly=True)
return bb_data[virtual] return bb_data[virtual]
@ -400,7 +400,7 @@ class Cache(NoCache):
self.cachefile = self.getCacheFile("bb_cache.dat") self.cachefile = self.getCacheFile("bb_cache.dat")
self.logger.debug(1, "Cache dir: %s", self.cachedir) self.logger.debug("Cache dir: %s", self.cachedir)
bb.utils.mkdirhier(self.cachedir) bb.utils.mkdirhier(self.cachedir)
cache_ok = True cache_ok = True
@ -408,7 +408,7 @@ class Cache(NoCache):
for cache_class in self.caches_array: for cache_class in self.caches_array:
cachefile = self.getCacheFile(cache_class.cachefile) cachefile = self.getCacheFile(cache_class.cachefile)
cache_exists = os.path.exists(cachefile) cache_exists = os.path.exists(cachefile)
self.logger.debug(2, "Checking if %s exists: %r", cachefile, cache_exists) self.logger.debug2("Checking if %s exists: %r", cachefile, cache_exists)
cache_ok = cache_ok and cache_exists cache_ok = cache_ok and cache_exists
cache_class.init_cacheData(self) cache_class.init_cacheData(self)
if cache_ok: if cache_ok:
@ -416,7 +416,7 @@ class Cache(NoCache):
elif os.path.isfile(self.cachefile): elif os.path.isfile(self.cachefile):
self.logger.info("Out of date cache found, rebuilding...") self.logger.info("Out of date cache found, rebuilding...")
else: else:
self.logger.debug(1, "Cache file %s not found, building..." % self.cachefile) self.logger.debug("Cache file %s not found, building..." % self.cachefile)
# We don't use the symlink, its just for debugging convinience # We don't use the symlink, its just for debugging convinience
if self.mc: if self.mc:
@ -453,7 +453,7 @@ class Cache(NoCache):
for cache_class in self.caches_array: for cache_class in self.caches_array:
cachefile = self.getCacheFile(cache_class.cachefile) cachefile = self.getCacheFile(cache_class.cachefile)
self.logger.debug(1, 'Loading cache file: %s' % cachefile) self.logger.debug('Loading cache file: %s' % cachefile)
with open(cachefile, "rb") as cachefile: with open(cachefile, "rb") as cachefile:
pickled = pickle.Unpickler(cachefile) pickled = pickle.Unpickler(cachefile)
# Check cache version information # Check cache version information
@ -500,7 +500,7 @@ class Cache(NoCache):
def parse(self, filename, appends): def parse(self, filename, appends):
"""Parse the specified filename, returning the recipe information""" """Parse the specified filename, returning the recipe information"""
self.logger.debug(1, "Parsing %s", filename) self.logger.debug("Parsing %s", filename)
infos = [] infos = []
datastores = self.load_bbfile(filename, appends, mc=self.mc) datastores = self.load_bbfile(filename, appends, mc=self.mc)
depends = [] depends = []
@ -554,7 +554,7 @@ class Cache(NoCache):
cached, infos = self.load(fn, appends) cached, infos = self.load(fn, appends)
for virtualfn, info_array in infos: for virtualfn, info_array in infos:
if info_array[0].skipped: if info_array[0].skipped:
self.logger.debug(1, "Skipping %s: %s", virtualfn, info_array[0].skipreason) self.logger.debug("Skipping %s: %s", virtualfn, info_array[0].skipreason)
skipped += 1 skipped += 1
else: else:
self.add_info(virtualfn, info_array, cacheData, not cached) self.add_info(virtualfn, info_array, cacheData, not cached)
@ -590,21 +590,21 @@ class Cache(NoCache):
# File isn't in depends_cache # File isn't in depends_cache
if not fn in self.depends_cache: if not fn in self.depends_cache:
self.logger.debug(2, "%s is not cached", fn) self.logger.debug2("%s is not cached", fn)
return False return False
mtime = bb.parse.cached_mtime_noerror(fn) mtime = bb.parse.cached_mtime_noerror(fn)
# Check file still exists # Check file still exists
if mtime == 0: if mtime == 0:
self.logger.debug(2, "%s no longer exists", fn) self.logger.debug2("%s no longer exists", fn)
self.remove(fn) self.remove(fn)
return False return False
info_array = self.depends_cache[fn] info_array = self.depends_cache[fn]
# Check the file's timestamp # Check the file's timestamp
if mtime != info_array[0].timestamp: if mtime != info_array[0].timestamp:
self.logger.debug(2, "%s changed", fn) self.logger.debug2("%s changed", fn)
self.remove(fn) self.remove(fn)
return False return False
@ -615,13 +615,13 @@ class Cache(NoCache):
fmtime = bb.parse.cached_mtime_noerror(f) fmtime = bb.parse.cached_mtime_noerror(f)
# Check if file still exists # Check if file still exists
if old_mtime != 0 and fmtime == 0: if old_mtime != 0 and fmtime == 0:
self.logger.debug(2, "%s's dependency %s was removed", self.logger.debug2("%s's dependency %s was removed",
fn, f) fn, f)
self.remove(fn) self.remove(fn)
return False return False
if (fmtime != old_mtime): if (fmtime != old_mtime):
self.logger.debug(2, "%s's dependency %s changed", self.logger.debug2("%s's dependency %s changed",
fn, f) fn, f)
self.remove(fn) self.remove(fn)
return False return False
@ -638,14 +638,14 @@ class Cache(NoCache):
continue continue
f, exist = f.split(":") f, exist = f.split(":")
if (exist == "True" and not os.path.exists(f)) or (exist == "False" and os.path.exists(f)): if (exist == "True" and not os.path.exists(f)) or (exist == "False" and os.path.exists(f)):
self.logger.debug(2, "%s's file checksum list file %s changed", self.logger.debug2("%s's file checksum list file %s changed",
fn, f) fn, f)
self.remove(fn) self.remove(fn)
return False return False
if tuple(appends) != tuple(info_array[0].appends): if tuple(appends) != tuple(info_array[0].appends):
self.logger.debug(2, "appends for %s changed", fn) self.logger.debug2("appends for %s changed", fn)
self.logger.debug(2, "%s to %s" % (str(appends), str(info_array[0].appends))) self.logger.debug2("%s to %s" % (str(appends), str(info_array[0].appends)))
self.remove(fn) self.remove(fn)
return False return False
@ -654,10 +654,10 @@ class Cache(NoCache):
virtualfn = variant2virtual(fn, cls) virtualfn = variant2virtual(fn, cls)
self.clean.add(virtualfn) self.clean.add(virtualfn)
if virtualfn not in self.depends_cache: if virtualfn not in self.depends_cache:
self.logger.debug(2, "%s is not cached", virtualfn) self.logger.debug2("%s is not cached", virtualfn)
invalid = True invalid = True
elif len(self.depends_cache[virtualfn]) != len(self.caches_array): elif len(self.depends_cache[virtualfn]) != len(self.caches_array):
self.logger.debug(2, "Extra caches missing for %s?" % virtualfn) self.logger.debug2("Extra caches missing for %s?" % virtualfn)
invalid = True invalid = True
# If any one of the variants is not present, mark as invalid for all # If any one of the variants is not present, mark as invalid for all
@ -665,10 +665,10 @@ class Cache(NoCache):
for cls in info_array[0].variants: for cls in info_array[0].variants:
virtualfn = variant2virtual(fn, cls) virtualfn = variant2virtual(fn, cls)
if virtualfn in self.clean: if virtualfn in self.clean:
self.logger.debug(2, "Removing %s from cache", virtualfn) self.logger.debug2("Removing %s from cache", virtualfn)
self.clean.remove(virtualfn) self.clean.remove(virtualfn)
if fn in self.clean: if fn in self.clean:
self.logger.debug(2, "Marking %s as not clean", fn) self.logger.debug2("Marking %s as not clean", fn)
self.clean.remove(fn) self.clean.remove(fn)
return False return False
@ -681,10 +681,10 @@ class Cache(NoCache):
Called from the parser in error cases Called from the parser in error cases
""" """
if fn in self.depends_cache: if fn in self.depends_cache:
self.logger.debug(1, "Removing %s from cache", fn) self.logger.debug("Removing %s from cache", fn)
del self.depends_cache[fn] del self.depends_cache[fn]
if fn in self.clean: if fn in self.clean:
self.logger.debug(1, "Marking %s as unclean", fn) self.logger.debug("Marking %s as unclean", fn)
self.clean.remove(fn) self.clean.remove(fn)
def sync(self): def sync(self):
@ -697,13 +697,13 @@ class Cache(NoCache):
return return
if self.cacheclean: if self.cacheclean:
self.logger.debug(2, "Cache is clean, not saving.") self.logger.debug2("Cache is clean, not saving.")
return return
for cache_class in self.caches_array: for cache_class in self.caches_array:
cache_class_name = cache_class.__name__ cache_class_name = cache_class.__name__
cachefile = self.getCacheFile(cache_class.cachefile) cachefile = self.getCacheFile(cache_class.cachefile)
self.logger.debug(2, "Writing %s", cachefile) self.logger.debug2("Writing %s", cachefile)
with open(cachefile, "wb") as f: with open(cachefile, "wb") as f:
p = pickle.Pickler(f, pickle.HIGHEST_PROTOCOL) p = pickle.Pickler(f, pickle.HIGHEST_PROTOCOL)
p.dump(__cache_version__) p.dump(__cache_version__)
@ -879,7 +879,7 @@ class MultiProcessCache(object):
bb.utils.mkdirhier(cachedir) bb.utils.mkdirhier(cachedir)
self.cachefile = os.path.join(cachedir, self.cachefile = os.path.join(cachedir,
cache_file_name or self.__class__.cache_file_name) cache_file_name or self.__class__.cache_file_name)
logger.debug(1, "Using cache in '%s'", self.cachefile) logger.debug("Using cache in '%s'", self.cachefile)
glf = bb.utils.lockfile(self.cachefile + ".lock") glf = bb.utils.lockfile(self.cachefile + ".lock")
@ -985,7 +985,7 @@ class SimpleCache(object):
bb.utils.mkdirhier(cachedir) bb.utils.mkdirhier(cachedir)
self.cachefile = os.path.join(cachedir, self.cachefile = os.path.join(cachedir,
cache_file_name or self.__class__.cache_file_name) cache_file_name or self.__class__.cache_file_name)
logger.debug(1, "Using cache in '%s'", self.cachefile) logger.debug("Using cache in '%s'", self.cachefile)
glf = bb.utils.lockfile(self.cachefile + ".lock") glf = bb.utils.lockfile(self.cachefile + ".lock")

14
bitbake/lib/bb/cooker.py
View File

@ -443,7 +443,7 @@ class BBCooker:
continue continue
except AttributeError: except AttributeError:
pass pass
logger.debug(1, "Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) logger.debug("Marking as dirty due to '%s' option change to '%s'" % (o, options[o]))
print("Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) print("Marking as dirty due to '%s' option change to '%s'" % (o, options[o]))
clean = False clean = False
if hasattr(self.configuration, o): if hasattr(self.configuration, o):
@ -470,17 +470,17 @@ class BBCooker:
for k in bb.utils.approved_variables(): for k in bb.utils.approved_variables():
if k in environment and k not in self.configuration.env: if k in environment and k not in self.configuration.env:
logger.debug(1, "Updating new environment variable %s to %s" % (k, environment[k])) logger.debug("Updating new environment variable %s to %s" % (k, environment[k]))
self.configuration.env[k] = environment[k] self.configuration.env[k] = environment[k]
clean = False clean = False
if k in self.configuration.env and k not in environment: if k in self.configuration.env and k not in environment:
logger.debug(1, "Updating environment variable %s (deleted)" % (k)) logger.debug("Updating environment variable %s (deleted)" % (k))
del self.configuration.env[k] del self.configuration.env[k]
clean = False clean = False
if k not in self.configuration.env and k not in environment: if k not in self.configuration.env and k not in environment:
continue continue
if environment[k] != self.configuration.env[k]: if environment[k] != self.configuration.env[k]:
logger.debug(1, "Updating environment variable %s from %s to %s" % (k, self.configuration.env[k], environment[k])) logger.debug("Updating environment variable %s from %s to %s" % (k, self.configuration.env[k], environment[k]))
self.configuration.env[k] = environment[k] self.configuration.env[k] = environment[k]
clean = False clean = False
@ -488,7 +488,7 @@ class BBCooker:
self.configuration.env = environment self.configuration.env = environment
if not clean: if not clean:
logger.debug(1, "Base environment change, triggering reparse") logger.debug("Base environment change, triggering reparse")
self.reset() self.reset()
def runCommands(self, server, data, abort): def runCommands(self, server, data, abort):
@ -699,7 +699,7 @@ class BBCooker:
if depmc not in self.multiconfigs: if depmc not in self.multiconfigs:
bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc)) bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc))
else: else:
logger.debug(1, "Adding providers for multiconfig dependency %s" % l[3]) logger.debug("Adding providers for multiconfig dependency %s" % l[3])
taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3]) taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3])
seen.add(k) seen.add(k)
new = True new = True
@ -1555,7 +1555,7 @@ class BBCooker:
self.inotify_modified_files = [] self.inotify_modified_files = []
if not self.baseconfig_valid: if not self.baseconfig_valid:
logger.debug(1, "Reloading base configuration data") logger.debug("Reloading base configuration data")
self.initConfigurationData() self.initConfigurationData()
self.handlePRServ() self.handlePRServ()

38
bitbake/lib/bb/fetch2/__init__.py
View File

@ -428,7 +428,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None):
uri_decoded = list(decodeurl(ud.url)) uri_decoded = list(decodeurl(ud.url))
uri_find_decoded = list(decodeurl(uri_find)) uri_find_decoded = list(decodeurl(uri_find))
uri_replace_decoded = list(decodeurl(uri_replace)) uri_replace_decoded = list(decodeurl(uri_replace))
logger.debug(2, "For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded)) logger.debug2("For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded))
result_decoded = ['', '', '', '', '', {}] result_decoded = ['', '', '', '', '', {}]
for loc, i in enumerate(uri_find_decoded): for loc, i in enumerate(uri_find_decoded):
result_decoded[loc] = uri_decoded[loc] result_decoded[loc] = uri_decoded[loc]
@ -474,7 +474,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None):
result = encodeurl(result_decoded) result = encodeurl(result_decoded)
if result == ud.url: if result == ud.url:
return None return None
logger.debug(2, "For url %s returning %s" % (ud.url, result)) logger.debug2("For url %s returning %s" % (ud.url, result))
return result return result
methods = [] methods = []
@ -499,9 +499,9 @@ def fetcher_init(d):
# When to drop SCM head revisions controlled by user policy # When to drop SCM head revisions controlled by user policy
srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear"
if srcrev_policy == "cache": if srcrev_policy == "cache":
logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) logger.debug("Keeping SRCREV cache due to cache policy of: %s", srcrev_policy)
elif srcrev_policy == "clear": elif srcrev_policy == "clear":
logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) logger.debug("Clearing SRCREV cache due to cache policy of: %s", srcrev_policy)
revs.clear() revs.clear()
else: else:
raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy) raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy)
@ -857,9 +857,9 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None, workdir=None):
cmd = 'export PSEUDO_DISABLED=1; ' + cmd cmd = 'export PSEUDO_DISABLED=1; ' + cmd
if workdir: if workdir:
logger.debug(1, "Running '%s' in %s" % (cmd, workdir)) logger.debug("Running '%s' in %s" % (cmd, workdir))
else: else:
logger.debug(1, "Running %s", cmd) logger.debug("Running %s", cmd)
success = False success = False
error_message = "" error_message = ""
@ -900,7 +900,7 @@ def check_network_access(d, info, url):
elif not trusted_network(d, url): elif not trusted_network(d, url):
raise UntrustedUrl(url, info) raise UntrustedUrl(url, info)
else: else:
logger.debug(1, "Fetcher accessed the network with the command %s" % info) logger.debug("Fetcher accessed the network with the command %s" % info)
def build_mirroruris(origud, mirrors, ld): def build_mirroruris(origud, mirrors, ld):
uris = [] uris = []
@ -926,7 +926,7 @@ def build_mirroruris(origud, mirrors, ld):
continue continue
if not trusted_network(ld, newuri): if not trusted_network(ld, newuri):
logger.debug(1, "Mirror %s not in the list of trusted networks, skipping" % (newuri)) logger.debug("Mirror %s not in the list of trusted networks, skipping" % (newuri))
continue continue
# Create a local copy of the mirrors minus the current line # Create a local copy of the mirrors minus the current line
@ -939,8 +939,8 @@ def build_mirroruris(origud, mirrors, ld):
newud = FetchData(newuri, ld) newud = FetchData(newuri, ld)
newud.setup_localpath(ld) newud.setup_localpath(ld)
except bb.fetch2.BBFetchException as e: except bb.fetch2.BBFetchException as e:
logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) logger.debug("Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
logger.debug(1, str(e)) logger.debug(str(e))
try: try:
# setup_localpath of file:// urls may fail, we should still see # setup_localpath of file:// urls may fail, we should still see
# if mirrors of the url exist # if mirrors of the url exist
@ -1043,8 +1043,8 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
elif isinstance(e, NoChecksumError): elif isinstance(e, NoChecksumError):
raise raise
else: else:
logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (ud.url, origud.url)) logger.debug("Mirror fetch failure for url %s (original url: %s)" % (ud.url, origud.url))
logger.debug(1, str(e)) logger.debug(str(e))
try: try:
ud.method.clean(ud, ld) ud.method.clean(ud, ld)
except UnboundLocalError: except UnboundLocalError:
@ -1688,7 +1688,7 @@ class Fetch(object):
if m.verify_donestamp(ud, self.d) and not m.need_update(ud, self.d): if m.verify_donestamp(ud, self.d) and not m.need_update(ud, self.d):
done = True done = True
elif m.try_premirror(ud, self.d): elif m.try_premirror(ud, self.d):
logger.debug(1, "Trying PREMIRRORS") logger.debug("Trying PREMIRRORS")
mirrors = mirror_from_string(self.d.getVar('PREMIRRORS')) mirrors = mirror_from_string(self.d.getVar('PREMIRRORS'))
done = m.try_mirrors(self, ud, self.d, mirrors) done = m.try_mirrors(self, ud, self.d, mirrors)
if done: if done:
@ -1698,7 +1698,7 @@ class Fetch(object):
m.update_donestamp(ud, self.d) m.update_donestamp(ud, self.d)
except ChecksumError as e: except ChecksumError as e:
logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % u) logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % u)
logger.debug(1, str(e)) logger.debug(str(e))
done = False done = False
if premirroronly: if premirroronly:
@ -1710,7 +1710,7 @@ class Fetch(object):
try: try:
if not trusted_network(self.d, ud.url): if not trusted_network(self.d, ud.url):
raise UntrustedUrl(ud.url) raise UntrustedUrl(ud.url)
logger.debug(1, "Trying Upstream") logger.debug("Trying Upstream")
m.download(ud, self.d) m.download(ud, self.d)
if hasattr(m, "build_mirror_data"): if hasattr(m, "build_mirror_data"):
m.build_mirror_data(ud, self.d) m.build_mirror_data(ud, self.d)
@ -1725,19 +1725,19 @@ class Fetch(object):
except BBFetchException as e: except BBFetchException as e:
if isinstance(e, ChecksumError): if isinstance(e, ChecksumError):
logger.warning("Checksum failure encountered with download of %s - will attempt other sources if available" % u) logger.warning("Checksum failure encountered with download of %s - will attempt other sources if available" % u)
logger.debug(1, str(e)) logger.debug(str(e))
if os.path.exists(ud.localpath): if os.path.exists(ud.localpath):
rename_bad_checksum(ud, e.checksum) rename_bad_checksum(ud, e.checksum)
elif isinstance(e, NoChecksumError): elif isinstance(e, NoChecksumError):
raise raise
else: else:
logger.warning('Failed to fetch URL %s, attempting MIRRORS if available' % u) logger.warning('Failed to fetch URL %s, attempting MIRRORS if available' % u)
logger.debug(1, str(e)) logger.debug(str(e))
firsterr = e firsterr = e
# Remove any incomplete fetch # Remove any incomplete fetch
if not verified_stamp: if not verified_stamp:
m.clean(ud, self.d) m.clean(ud, self.d)
logger.debug(1, "Trying MIRRORS") logger.debug("Trying MIRRORS")
mirrors = mirror_from_string(self.d.getVar('MIRRORS')) mirrors = mirror_from_string(self.d.getVar('MIRRORS'))
done = m.try_mirrors(self, ud, self.d, mirrors) done = m.try_mirrors(self, ud, self.d, mirrors)
@ -1774,7 +1774,7 @@ class Fetch(object):
ud = self.ud[u] ud = self.ud[u]
ud.setup_localpath(self.d) ud.setup_localpath(self.d)
m = ud.method m = ud.method
logger.debug(1, "Testing URL %s", u) logger.debug("Testing URL %s", u)
# First try checking uri, u, from PREMIRRORS # First try checking uri, u, from PREMIRRORS
mirrors = mirror_from_string(self.d.getVar('PREMIRRORS')) mirrors = mirror_from_string(self.d.getVar('PREMIRRORS'))
ret = m.try_mirrors(self, ud, self.d, mirrors, True) ret = m.try_mirrors(self, ud, self.d, mirrors, True)

8
bitbake/lib/bb/fetch2/bzr.py
View File

@ -74,16 +74,16 @@ class Bzr(FetchMethod):
if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK): if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
bzrcmd = self._buildbzrcommand(ud, d, "update") bzrcmd = self._buildbzrcommand(ud, d, "update")
logger.debug(1, "BZR Update %s", ud.url) logger.debug("BZR Update %s", ud.url)
bb.fetch2.check_network_access(d, bzrcmd, ud.url) bb.fetch2.check_network_access(d, bzrcmd, ud.url)
runfetchcmd(bzrcmd, d, workdir=os.path.join(ud.pkgdir, os.path.basename(ud.path))) runfetchcmd(bzrcmd, d, workdir=os.path.join(ud.pkgdir, os.path.basename(ud.path)))
else: else:
bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True) bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True)
bzrcmd = self._buildbzrcommand(ud, d, "fetch") bzrcmd = self._buildbzrcommand(ud, d, "fetch")
bb.fetch2.check_network_access(d, bzrcmd, ud.url) bb.fetch2.check_network_access(d, bzrcmd, ud.url)
logger.debug(1, "BZR Checkout %s", ud.url) logger.debug("BZR Checkout %s", ud.url)
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
logger.debug(1, "Running %s", bzrcmd) logger.debug("Running %s", bzrcmd)
runfetchcmd(bzrcmd, d, workdir=ud.pkgdir) runfetchcmd(bzrcmd, d, workdir=ud.pkgdir)
scmdata = ud.parm.get("scmdata", "") scmdata = ud.parm.get("scmdata", "")
@ -109,7 +109,7 @@ class Bzr(FetchMethod):
""" """
Return the latest upstream revision number Return the latest upstream revision number
""" """
logger.debug(2, "BZR fetcher hitting network for %s", ud.url) logger.debug2("BZR fetcher hitting network for %s", ud.url)
bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno"), ud.url) bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno"), ud.url)

2
bitbake/lib/bb/fetch2/clearcase.py
View File

@ -70,7 +70,7 @@ class ClearCase(FetchMethod):
return ud.type in ['ccrc'] return ud.type in ['ccrc']
def debug(self, msg): def debug(self, msg):
logger.debug(1, "ClearCase: %s", msg) logger.debug("ClearCase: %s", msg)
def urldata_init(self, ud, d): def urldata_init(self, ud, d):
""" """

4
bitbake/lib/bb/fetch2/cvs.py
View File

@ -109,7 +109,7 @@ class Cvs(FetchMethod):
cvsupdatecmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvsupdatecmd) cvsupdatecmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvsupdatecmd)
# create module directory # create module directory
logger.debug(2, "Fetch: checking for module directory") logger.debug2("Fetch: checking for module directory")
moddir = os.path.join(ud.pkgdir, localdir) moddir = os.path.join(ud.pkgdir, localdir)
workdir = None workdir = None
if os.access(os.path.join(moddir, 'CVS'), os.R_OK): if os.access(os.path.join(moddir, 'CVS'), os.R_OK):
@ -123,7 +123,7 @@ class Cvs(FetchMethod):
# check out sources there # check out sources there
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
workdir = ud.pkgdir workdir = ud.pkgdir
logger.debug(1, "Running %s", cvscmd) logger.debug("Running %s", cvscmd)
bb.fetch2.check_network_access(d, cvscmd, ud.url) bb.fetch2.check_network_access(d, cvscmd, ud.url)
cmd = cvscmd cmd = cvscmd

4
bitbake/lib/bb/fetch2/gitsm.py
View File

@ -78,7 +78,7 @@ class GitSM(Git):
module_hash = "" module_hash = ""
if not module_hash: if not module_hash:
logger.debug(1, "submodule %s is defined, but is not initialized in the repository. Skipping", m) logger.debug("submodule %s is defined, but is not initialized in the repository. Skipping", m)
continue continue
submodules.append(m) submodules.append(m)
@ -179,7 +179,7 @@ class GitSM(Git):
(ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=ud.clonedir) (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=ud.clonedir)
if len(need_update_list) > 0: if len(need_update_list) > 0:
logger.debug(1, 'gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list)))
return True return True
return False return False

16
bitbake/lib/bb/fetch2/hg.py
View File

@ -150,7 +150,7 @@ class Hg(FetchMethod):
def download(self, ud, d): def download(self, ud, d):
"""Fetch url""" """Fetch url"""
logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'")
# If the checkout doesn't exist and the mirror tarball does, extract it # If the checkout doesn't exist and the mirror tarball does, extract it
if not os.path.exists(ud.pkgdir) and os.path.exists(ud.fullmirror): if not os.path.exists(ud.pkgdir) and os.path.exists(ud.fullmirror):
@ -160,7 +160,7 @@ class Hg(FetchMethod):
if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK): if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK):
# Found the source, check whether need pull # Found the source, check whether need pull
updatecmd = self._buildhgcommand(ud, d, "update") updatecmd = self._buildhgcommand(ud, d, "update")
logger.debug(1, "Running %s", updatecmd) logger.debug("Running %s", updatecmd)
try: try:
runfetchcmd(updatecmd, d, workdir=ud.moddir) runfetchcmd(updatecmd, d, workdir=ud.moddir)
except bb.fetch2.FetchError: except bb.fetch2.FetchError:
@ -168,7 +168,7 @@ class Hg(FetchMethod):
pullcmd = self._buildhgcommand(ud, d, "pull") pullcmd = self._buildhgcommand(ud, d, "pull")
logger.info("Pulling " + ud.url) logger.info("Pulling " + ud.url)
# update sources there # update sources there
logger.debug(1, "Running %s", pullcmd) logger.debug("Running %s", pullcmd)
bb.fetch2.check_network_access(d, pullcmd, ud.url) bb.fetch2.check_network_access(d, pullcmd, ud.url)
runfetchcmd(pullcmd, d, workdir=ud.moddir) runfetchcmd(pullcmd, d, workdir=ud.moddir)
try: try:
@ -183,14 +183,14 @@ class Hg(FetchMethod):
logger.info("Fetch " + ud.url) logger.info("Fetch " + ud.url)
# check out sources there # check out sources there
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
logger.debug(1, "Running %s", fetchcmd) logger.debug("Running %s", fetchcmd)
bb.fetch2.check_network_access(d, fetchcmd, ud.url) bb.fetch2.check_network_access(d, fetchcmd, ud.url)
runfetchcmd(fetchcmd, d, workdir=ud.pkgdir) runfetchcmd(fetchcmd, d, workdir=ud.pkgdir)
# Even when we clone (fetch), we still need to update as hg's clone # Even when we clone (fetch), we still need to update as hg's clone
# won't checkout the specified revision if its on a branch # won't checkout the specified revision if its on a branch
updatecmd = self._buildhgcommand(ud, d, "update") updatecmd = self._buildhgcommand(ud, d, "update")
logger.debug(1, "Running %s", updatecmd) logger.debug("Running %s", updatecmd)
runfetchcmd(updatecmd, d, workdir=ud.moddir) runfetchcmd(updatecmd, d, workdir=ud.moddir)
def clean(self, ud, d): def clean(self, ud, d):
@ -247,9 +247,9 @@ class Hg(FetchMethod):
if scmdata != "nokeep": if scmdata != "nokeep":
proto = ud.parm.get('protocol', 'http') proto = ud.parm.get('protocol', 'http')
if not os.access(os.path.join(codir, '.hg'), os.R_OK): if not os.access(os.path.join(codir, '.hg'), os.R_OK):
logger.debug(2, "Unpack: creating new hg repository in '" + codir + "'") logger.debug2("Unpack: creating new hg repository in '" + codir + "'")
runfetchcmd("%s init %s" % (ud.basecmd, codir), d) runfetchcmd("%s init %s" % (ud.basecmd, codir), d)
logger.debug(2, "Unpack: updating source in '" + codir + "'") logger.debug2("Unpack: updating source in '" + codir + "'")
if ud.user and ud.pswd: if ud.user and ud.pswd:
runfetchcmd("%s --config auth.default.prefix=* --config auth.default.username=%s --config auth.default.password=%s --config \"auth.default.schemes=%s\" pull %s" % (ud.basecmd, ud.user, ud.pswd, proto, ud.moddir), d, workdir=codir) runfetchcmd("%s --config auth.default.prefix=* --config auth.default.username=%s --config auth.default.password=%s --config \"auth.default.schemes=%s\" pull %s" % (ud.basecmd, ud.user, ud.pswd, proto, ud.moddir), d, workdir=codir)
else: else:
@ -259,5 +259,5 @@ class Hg(FetchMethod):
else: else:
runfetchcmd("%s up -C %s" % (ud.basecmd, revflag), d, workdir=codir) runfetchcmd("%s up -C %s" % (ud.basecmd, revflag), d, workdir=codir)
else: else:
logger.debug(2, "Unpack: extracting source to '" + codir + "'") logger.debug2("Unpack: extracting source to '" + codir + "'")
runfetchcmd("%s archive -t files %s %s" % (ud.basecmd, revflag, codir), d, workdir=ud.moddir) runfetchcmd("%s archive -t files %s %s" % (ud.basecmd, revflag, codir), d, workdir=ud.moddir)

4
bitbake/lib/bb/fetch2/local.py
View File

@ -54,12 +54,12 @@ class Local(FetchMethod):
return [path] return [path]
filespath = d.getVar('FILESPATH') filespath = d.getVar('FILESPATH')
if filespath: if filespath:
logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":")))) logger.debug2("Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
newpath, hist = bb.utils.which(filespath, path, history=True) newpath, hist = bb.utils.which(filespath, path, history=True)
searched.extend(hist) searched.extend(hist)
if not os.path.exists(newpath): if not os.path.exists(newpath):
dldirfile = os.path.join(d.getVar("DL_DIR"), path) dldirfile = os.path.join(d.getVar("DL_DIR"), path)
logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path)) logger.debug2("Defaulting to %s for %s" % (dldirfile, path))
bb.utils.mkdirhier(os.path.dirname(dldirfile)) bb.utils.mkdirhier(os.path.dirname(dldirfile))
searched.append(dldirfile) searched.append(dldirfile)
return searched return searched

6
bitbake/lib/bb/fetch2/osc.py
View File

@ -84,13 +84,13 @@ class Osc(FetchMethod):
Fetch url Fetch url
""" """
logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'")
if os.access(os.path.join(d.getVar('OSCDIR'), ud.path, ud.module), os.R_OK): if os.access(os.path.join(d.getVar('OSCDIR'), ud.path, ud.module), os.R_OK):
oscupdatecmd = self._buildosccommand(ud, d, "update") oscupdatecmd = self._buildosccommand(ud, d, "update")
logger.info("Update "+ ud.url) logger.info("Update "+ ud.url)
# update sources there # update sources there
logger.debug(1, "Running %s", oscupdatecmd) logger.debug("Running %s", oscupdatecmd)
bb.fetch2.check_network_access(d, oscupdatecmd, ud.url) bb.fetch2.check_network_access(d, oscupdatecmd, ud.url)
runfetchcmd(oscupdatecmd, d, workdir=ud.moddir) runfetchcmd(oscupdatecmd, d, workdir=ud.moddir)
else: else:
@ -98,7 +98,7 @@ class Osc(FetchMethod):
logger.info("Fetch " + ud.url) logger.info("Fetch " + ud.url)
# check out sources there # check out sources there
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
logger.debug(1, "Running %s", oscfetchcmd) logger.debug("Running %s", oscfetchcmd)
bb.fetch2.check_network_access(d, oscfetchcmd, ud.url) bb.fetch2.check_network_access(d, oscfetchcmd, ud.url)
runfetchcmd(oscfetchcmd, d, workdir=ud.pkgdir) runfetchcmd(oscfetchcmd, d, workdir=ud.pkgdir)

10
bitbake/lib/bb/fetch2/perforce.py
View File

@ -90,16 +90,16 @@ class Perforce(FetchMethod):
p4port = d.getVar('P4PORT') p4port = d.getVar('P4PORT')
if p4port: if p4port:
logger.debug(1, 'Using recipe provided P4PORT: %s' % p4port) logger.debug('Using recipe provided P4PORT: %s' % p4port)
ud.host = p4port ud.host = p4port
else: else:
logger.debug(1, 'Trying to use P4CONFIG to automatically set P4PORT...') logger.debug('Trying to use P4CONFIG to automatically set P4PORT...')
ud.usingp4config = True ud.usingp4config = True
p4cmd = '%s info | grep "Server address"' % ud.basecmd p4cmd = '%s info | grep "Server address"' % ud.basecmd
bb.fetch2.check_network_access(d, p4cmd, ud.url) bb.fetch2.check_network_access(d, p4cmd, ud.url)
ud.host = runfetchcmd(p4cmd, d, True) ud.host = runfetchcmd(p4cmd, d, True)
ud.host = ud.host.split(': ')[1].strip() ud.host = ud.host.split(': ')[1].strip()
logger.debug(1, 'Determined P4PORT to be: %s' % ud.host) logger.debug('Determined P4PORT to be: %s' % ud.host)
if not ud.host: if not ud.host:
raise FetchError('Could not determine P4PORT from P4CONFIG') raise FetchError('Could not determine P4PORT from P4CONFIG')
@ -208,7 +208,7 @@ class Perforce(FetchMethod):
for filename in p4fileslist: for filename in p4fileslist:
item = filename.split(' - ') item = filename.split(' - ')
lastaction = item[1].split() lastaction = item[1].split()
logger.debug(1, 'File: %s Last Action: %s' % (item[0], lastaction[0])) logger.debug('File: %s Last Action: %s' % (item[0], lastaction[0]))
if lastaction[0] == 'delete': if lastaction[0] == 'delete':
continue continue
filelist.append(item[0]) filelist.append(item[0])
@ -255,7 +255,7 @@ class Perforce(FetchMethod):
raise FetchError('Could not determine the latest perforce changelist') raise FetchError('Could not determine the latest perforce changelist')
tipcset = tip.split(' ')[1] tipcset = tip.split(' ')[1]
logger.debug(1, 'p4 tip found to be changelist %s' % tipcset) logger.debug('p4 tip found to be changelist %s' % tipcset)
return tipcset return tipcset
def sortable_revision(self, ud, d, name): def sortable_revision(self, ud, d, name):

2
bitbake/lib/bb/fetch2/repo.py
View File

@ -47,7 +47,7 @@ class Repo(FetchMethod):
"""Fetch url""" """Fetch url"""
if os.access(os.path.join(d.getVar("DL_DIR"), ud.localfile), os.R_OK): if os.access(os.path.join(d.getVar("DL_DIR"), ud.localfile), os.R_OK):
logger.debug(1, "%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath) logger.debug("%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath)
return return
repodir = d.getVar("REPODIR") or (d.getVar("DL_DIR") + "/repo") repodir = d.getVar("REPODIR") or (d.getVar("DL_DIR") + "/repo")

6
bitbake/lib/bb/fetch2/svn.py
View File

@ -116,7 +116,7 @@ class Svn(FetchMethod):
def download(self, ud, d): def download(self, ud, d):
"""Fetch url""" """Fetch url"""
logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'")
lf = bb.utils.lockfile(ud.svnlock) lf = bb.utils.lockfile(ud.svnlock)
@ -129,7 +129,7 @@ class Svn(FetchMethod):
runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir) runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir)
except FetchError: except FetchError:
pass pass
logger.debug(1, "Running %s", svncmd) logger.debug("Running %s", svncmd)
bb.fetch2.check_network_access(d, svncmd, ud.url) bb.fetch2.check_network_access(d, svncmd, ud.url)
runfetchcmd(svncmd, d, workdir=ud.moddir) runfetchcmd(svncmd, d, workdir=ud.moddir)
else: else:
@ -137,7 +137,7 @@ class Svn(FetchMethod):
logger.info("Fetch " + ud.url) logger.info("Fetch " + ud.url)
# check out sources there # check out sources there
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
logger.debug(1, "Running %s", svncmd) logger.debug("Running %s", svncmd)
bb.fetch2.check_network_access(d, svncmd, ud.url) bb.fetch2.check_network_access(d, svncmd, ud.url)
runfetchcmd(svncmd, d, workdir=ud.pkgdir) runfetchcmd(svncmd, d, workdir=ud.pkgdir)

6
bitbake/lib/bb/fetch2/wget.py
View File

@ -88,7 +88,7 @@ class Wget(FetchMethod):
progresshandler = WgetProgressHandler(d) progresshandler = WgetProgressHandler(d)
logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command)) logger.debug2("Fetching %s using command '%s'" % (ud.url, command))
bb.fetch2.check_network_access(d, command, ud.url) bb.fetch2.check_network_access(d, command, ud.url)
runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler, workdir=workdir) runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler, workdir=workdir)
@ -326,11 +326,11 @@ class Wget(FetchMethod):
pass pass
except urllib.error.URLError as e: except urllib.error.URLError as e:
if try_again: if try_again:
logger.debug(2, "checkstatus: trying again") logger.debug2("checkstatus: trying again")
return self.checkstatus(fetch, ud, d, False) return self.checkstatus(fetch, ud, d, False)
else: else:
# debug for now to avoid spamming the logs in e.g. remote sstate searches # debug for now to avoid spamming the logs in e.g. remote sstate searches
logger.debug(2, "checkstatus() urlopen failed: %s" % e) logger.debug2("checkstatus() urlopen failed: %s" % e)
return False return False
return True return True

2
bitbake/lib/bb/parse/__init__.py
View File

@ -71,7 +71,7 @@ def update_mtime(f):
def update_cache(f): def update_cache(f):
if f in __mtime_cache: if f in __mtime_cache:
logger.debug(1, "Updating mtime cache for %s" % f) logger.debug("Updating mtime cache for %s" % f)
update_mtime(f) update_mtime(f)
def clear_cache(): def clear_cache():

4
bitbake/lib/bb/parse/ast.py
View File

@ -34,7 +34,7 @@ class IncludeNode(AstNode):
Include the file and evaluate the statements Include the file and evaluate the statements
""" """
s = data.expand(self.what_file) s = data.expand(self.what_file)
logger.debug(2, "CONF %s:%s: including %s", self.filename, self.lineno, s) logger.debug2("CONF %s:%s: including %s", self.filename, self.lineno, s)
# TODO: Cache those includes... maybe not here though # TODO: Cache those includes... maybe not here though
if self.force: if self.force:
@ -376,7 +376,7 @@ def _create_variants(datastores, names, function, onlyfinalise):
def multi_finalize(fn, d): def multi_finalize(fn, d):
appends = (d.getVar("__BBAPPEND") or "").split() appends = (d.getVar("__BBAPPEND") or "").split()
for append in appends: for append in appends:
logger.debug(1, "Appending .bbappend file %s to %s", append, fn) logger.debug("Appending .bbappend file %s to %s", append, fn)
bb.parse.BBHandler.handle(append, d, True) bb.parse.BBHandler.handle(append, d, True)
onlyfinalise = d.getVar("__ONLYFINALISE", False) onlyfinalise = d.getVar("__ONLYFINALISE", False)

2
bitbake/lib/bb/parse/parse_py/BBHandler.py
View File

@ -60,7 +60,7 @@ def inherit(files, fn, lineno, d):
file = abs_fn file = abs_fn
if not file in __inherit_cache: if not file in __inherit_cache:
logger.debug(1, "Inheriting %s (from %s:%d)" % (file, fn, lineno)) logger.debug("Inheriting %s (from %s:%d)" % (file, fn, lineno))
__inherit_cache.append( file ) __inherit_cache.append( file )
d.setVar('__inherit_cache', __inherit_cache) d.setVar('__inherit_cache', __inherit_cache)
include(fn, file, lineno, d, "inherit") include(fn, file, lineno, d, "inherit")

2
bitbake/lib/bb/parse/parse_py/ConfHandler.py
View File

@ -95,7 +95,7 @@ def include_single_file(parentfn, fn, lineno, data, error_out):
if exc.errno == errno.ENOENT: if exc.errno == errno.ENOENT:
if error_out: if error_out:
raise ParseError("Could not %s file %s" % (error_out, fn), parentfn, lineno) raise ParseError("Could not %s file %s" % (error_out, fn), parentfn, lineno)
logger.debug(2, "CONF file '%s' not found", fn) logger.debug2("CONF file '%s' not found", fn)
else: else:
if error_out: if error_out:
raise ParseError("Could not %s file %s: %s" % (error_out, fn, exc.strerror), parentfn, lineno) raise ParseError("Could not %s file %s: %s" % (error_out, fn, exc.strerror), parentfn, lineno)

2
bitbake/lib/bb/persist_data.py
View File

@ -248,7 +248,7 @@ class PersistData(object):
stacklevel=2) stacklevel=2)
self.data = persist(d) self.data = persist(d)
logger.debug(1, "Using '%s' as the persistent data cache", logger.debug("Using '%s' as the persistent data cache",
self.data.filename) self.data.filename)
def addDomain(self, domain): def addDomain(self, domain):

20
bitbake/lib/bb/providers.py
View File

@ -165,7 +165,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
available_vers.sort() available_vers.sort()
logger.warn("versions of %s available: %s", pn, ' '.join(available_vers)) logger.warn("versions of %s available: %s", pn, ' '.join(available_vers))
else: else:
logger.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr) logger.debug("selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr)
return (preferred_ver, preferred_file) return (preferred_ver, preferred_file)
@ -232,7 +232,7 @@ def _filterProviders(providers, item, cfgData, dataCache):
pkg_pn[pn] = [] pkg_pn[pn] = []
pkg_pn[pn].append(p) pkg_pn[pn].append(p)
logger.debug(1, "providers for %s are: %s", item, list(sorted(pkg_pn.keys()))) logger.debug("providers for %s are: %s", item, list(sorted(pkg_pn.keys())))
# First add PREFERRED_VERSIONS # First add PREFERRED_VERSIONS
for pn in sorted(pkg_pn): for pn in sorted(pkg_pn):
@ -291,7 +291,7 @@ def filterProviders(providers, item, cfgData, dataCache):
foundUnique = True foundUnique = True
break break
logger.debug(1, "sorted providers for %s are: %s", item, eligible) logger.debug("sorted providers for %s are: %s", item, eligible)
return eligible, foundUnique return eligible, foundUnique
@ -333,7 +333,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache):
provides = dataCache.pn_provides[pn] provides = dataCache.pn_provides[pn]
for provide in provides: for provide in provides:
prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide) prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide)
#logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) #logger.debug("checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys())
if prefervar in pns and pns[prefervar] not in preferred: if prefervar in pns and pns[prefervar] not in preferred:
var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar)
logger.verbose("selecting %s to satisfy runtime %s due to %s", prefervar, item, var) logger.verbose("selecting %s to satisfy runtime %s due to %s", prefervar, item, var)
@ -349,7 +349,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache):
if numberPreferred > 1: if numberPreferred > 1:
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)) 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))
logger.debug(1, "sorted runtime providers for %s are: %s", item, eligible) logger.debug("sorted runtime providers for %s are: %s", item, eligible)
return eligible, numberPreferred return eligible, numberPreferred
@ -384,7 +384,7 @@ def getRuntimeProviders(dataCache, rdepend):
regexp_cache[pattern] = regexp regexp_cache[pattern] = regexp
if regexp.match(rdepend): if regexp.match(rdepend):
rproviders += dataCache.packages_dynamic[pattern] rproviders += dataCache.packages_dynamic[pattern]
logger.debug(1, "Assuming %s is a dynamic package, but it may not exist" % rdepend) logger.debug("Assuming %s is a dynamic package, but it may not exist" % rdepend)
return rproviders return rproviders
@ -396,22 +396,22 @@ def buildWorldTargetList(dataCache, task=None):
if dataCache.world_target: if dataCache.world_target:
return return
logger.debug(1, "collating packages for \"world\"") logger.debug("collating packages for \"world\"")
for f in dataCache.possible_world: for f in dataCache.possible_world:
terminal = True terminal = True
pn = dataCache.pkg_fn[f] pn = dataCache.pkg_fn[f]
if task and task not in dataCache.task_deps[f]['tasks']: if task and task not in dataCache.task_deps[f]['tasks']:
logger.debug(2, "World build skipping %s as task %s doesn't exist", f, task) logger.debug2("World build skipping %s as task %s doesn't exist", f, task)
terminal = False terminal = False
for p in dataCache.pn_provides[pn]: for p in dataCache.pn_provides[pn]:
if p.startswith('virtual/'): if p.startswith('virtual/'):
logger.debug(2, "World build skipping %s due to %s provider starting with virtual/", f, p) logger.debug2("World build skipping %s due to %s provider starting with virtual/", f, p)
terminal = False terminal = False
break break
for pf in dataCache.providers[p]: for pf in dataCache.providers[p]:
if dataCache.pkg_fn[pf] != pn: if dataCache.pkg_fn[pf] != pn:
logger.debug(2, "World build skipping %s due to both us and %s providing %s", f, pf, p) logger.debug2("World build skipping %s due to both us and %s providing %s", f, pf, p)
terminal = False terminal = False
break break
if terminal: if terminal:

64
bitbake/lib/bb/runqueue.py
View File

@ -544,8 +544,8 @@ class RunQueueData:
for tid in self.runtaskentries: for tid in self.runtaskentries:
if task_done[tid] is False or deps_left[tid] != 0: if task_done[tid] is False or deps_left[tid] != 0:
problem_tasks.append(tid) problem_tasks.append(tid)
logger.debug(2, "Task %s is not buildable", tid) logger.debug2("Task %s is not buildable", tid)
logger.debug(2, "(Complete marker was %s and the remaining dependency count was %s)\n", task_done[tid], deps_left[tid]) logger.debug2("(Complete marker was %s and the remaining dependency count was %s)\n", task_done[tid], deps_left[tid])
self.runtaskentries[tid].weight = weight[tid] self.runtaskentries[tid].weight = weight[tid]
if problem_tasks: if problem_tasks:
@ -643,7 +643,7 @@ class RunQueueData:
(mc, fn, taskname, taskfn) = split_tid_mcfn(tid) (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
#runtid = build_tid(mc, fn, taskname) #runtid = build_tid(mc, fn, taskname)
#logger.debug(2, "Processing %s,%s:%s", mc, fn, taskname) #logger.debug2("Processing %s,%s:%s", mc, fn, taskname)
depends = set() depends = set()
task_deps = self.dataCaches[mc].task_deps[taskfn] task_deps = self.dataCaches[mc].task_deps[taskfn]
@ -1199,9 +1199,9 @@ class RunQueueData:
""" """
Dump some debug information on the internal data structures Dump some debug information on the internal data structures
""" """
logger.debug(3, "run_tasks:") logger.debug3("run_tasks:")
for tid in self.runtaskentries: for tid in self.runtaskentries:
logger.debug(3, " %s: %s Deps %s RevDeps %s", tid, logger.debug3(" %s: %s Deps %s RevDeps %s", tid,
self.runtaskentries[tid].weight, self.runtaskentries[tid].weight,
self.runtaskentries[tid].depends, self.runtaskentries[tid].depends,
self.runtaskentries[tid].revdeps) self.runtaskentries[tid].revdeps)
@ -1238,7 +1238,7 @@ class RunQueue:
self.fakeworker = {} self.fakeworker = {}
def _start_worker(self, mc, fakeroot = False, rqexec = None): def _start_worker(self, mc, fakeroot = False, rqexec = None):
logger.debug(1, "Starting bitbake-worker") logger.debug("Starting bitbake-worker")
magic = "decafbad" magic = "decafbad"
if self.cooker.configuration.profile: if self.cooker.configuration.profile:
magic = "decafbadbad" magic = "decafbadbad"
@ -1283,7 +1283,7 @@ class RunQueue:
def _teardown_worker(self, worker): def _teardown_worker(self, worker):
if not worker: if not worker:
return return
logger.debug(1, "Teardown for bitbake-worker") logger.debug("Teardown for bitbake-worker")
try: try:
worker.process.stdin.write(b"<quit></quit>") worker.process.stdin.write(b"<quit></quit>")
worker.process.stdin.flush() worker.process.stdin.flush()
@ -1356,12 +1356,12 @@ class RunQueue:
# If the stamp is missing, it's not current # If the stamp is missing, it's not current
if not os.access(stampfile, os.F_OK): if not os.access(stampfile, os.F_OK):
logger.debug(2, "Stampfile %s not available", stampfile) logger.debug2("Stampfile %s not available", stampfile)
return False return False
# If it's a 'nostamp' task, it's not current # If it's a 'nostamp' task, it's not current
taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn] taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
if 'nostamp' in taskdep and taskname in taskdep['nostamp']: if 'nostamp' in taskdep and taskname in taskdep['nostamp']:
logger.debug(2, "%s.%s is nostamp\n", fn, taskname) logger.debug2("%s.%s is nostamp\n", fn, taskname)
return False return False
if taskname != "do_setscene" and taskname.endswith("_setscene"): if taskname != "do_setscene" and taskname.endswith("_setscene"):
@ -1385,18 +1385,18 @@ class RunQueue:
continue continue
if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist):
if not t2: if not t2:
logger.debug(2, 'Stampfile %s does not exist', stampfile2) logger.debug2('Stampfile %s does not exist', stampfile2)
iscurrent = False iscurrent = False
break break
if t1 < t2: if t1 < t2:
logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2) logger.debug2('Stampfile %s < %s', stampfile, stampfile2)
iscurrent = False iscurrent = False
break break
if recurse and iscurrent: if recurse and iscurrent:
if dep in cache: if dep in cache:
iscurrent = cache[dep] iscurrent = cache[dep]
if not iscurrent: if not iscurrent:
logger.debug(2, 'Stampfile for dependency %s:%s invalid (cached)' % (fn2, taskname2)) logger.debug2('Stampfile for dependency %s:%s invalid (cached)' % (fn2, taskname2))
else: else:
iscurrent = self.check_stamp_task(dep, recurse=True, cache=cache) iscurrent = self.check_stamp_task(dep, recurse=True, cache=cache)
cache[dep] = iscurrent cache[dep] = iscurrent
@ -1761,7 +1761,7 @@ class RunQueueExecute:
for scheduler in schedulers: for scheduler in schedulers:
if self.scheduler == scheduler.name: if self.scheduler == scheduler.name:
self.sched = scheduler(self, self.rqdata) self.sched = scheduler(self, self.rqdata)
logger.debug(1, "Using runqueue scheduler '%s'", scheduler.name) logger.debug("Using runqueue scheduler '%s'", scheduler.name)
break break
else: else:
bb.fatal("Invalid scheduler '%s'. Available schedulers: %s" % bb.fatal("Invalid scheduler '%s'. Available schedulers: %s" %
@ -1899,7 +1899,7 @@ class RunQueueExecute:
break break
if alldeps: if alldeps:
self.setbuildable(revdep) self.setbuildable(revdep)
logger.debug(1, "Marking task %s as buildable", revdep) logger.debug("Marking task %s as buildable", revdep)
def task_complete(self, task): def task_complete(self, task):
self.stats.taskCompleted() self.stats.taskCompleted()
@ -1929,7 +1929,7 @@ class RunQueueExecute:
def summarise_scenequeue_errors(self): def summarise_scenequeue_errors(self):
err = False err = False
if not self.sqdone: if not self.sqdone:
logger.debug(1, 'We could skip tasks %s', "\n".join(sorted(self.scenequeue_covered))) logger.debug('We could skip tasks %s', "\n".join(sorted(self.scenequeue_covered)))
completeevent = sceneQueueComplete(self.sq_stats, self.rq) completeevent = sceneQueueComplete(self.sq_stats, self.rq)
bb.event.fire(completeevent, self.cfgData) bb.event.fire(completeevent, self.cfgData)
if self.sq_deferred: if self.sq_deferred:
@ -1986,7 +1986,7 @@ class RunQueueExecute:
if nexttask in self.sq_buildable and nexttask not in self.sq_running and self.sqdata.stamps[nexttask] not in self.build_stamps.values(): if nexttask in self.sq_buildable and nexttask not in self.sq_running and self.sqdata.stamps[nexttask] not in self.build_stamps.values():
if nexttask not in self.sqdata.unskippable and len(self.sqdata.sq_revdeps[nexttask]) > 0 and self.sqdata.sq_revdeps[nexttask].issubset(self.scenequeue_covered) and self.check_dependencies(nexttask, self.sqdata.sq_revdeps[nexttask]): if nexttask not in self.sqdata.unskippable and len(self.sqdata.sq_revdeps[nexttask]) > 0 and self.sqdata.sq_revdeps[nexttask].issubset(self.scenequeue_covered) and self.check_dependencies(nexttask, self.sqdata.sq_revdeps[nexttask]):
if nexttask not in self.rqdata.target_tids: if nexttask not in self.rqdata.target_tids:
logger.debug(2, "Skipping setscene for task %s" % nexttask) logger.debug2("Skipping setscene for task %s" % nexttask)
self.sq_task_skip(nexttask) self.sq_task_skip(nexttask)
self.scenequeue_notneeded.add(nexttask) self.scenequeue_notneeded.add(nexttask)
if nexttask in self.sq_deferred: if nexttask in self.sq_deferred:
@ -1999,28 +1999,28 @@ class RunQueueExecute:
if nexttask in self.sq_deferred: if nexttask in self.sq_deferred:
if self.sq_deferred[nexttask] not in self.runq_complete: if self.sq_deferred[nexttask] not in self.runq_complete:
continue continue
logger.debug(1, "Task %s no longer deferred" % nexttask) logger.debug("Task %s no longer deferred" % nexttask)
del self.sq_deferred[nexttask] del self.sq_deferred[nexttask]
valid = self.rq.validate_hashes(set([nexttask]), self.cooker.data, 0, False, summary=False) valid = self.rq.validate_hashes(set([nexttask]), self.cooker.data, 0, False, summary=False)
if not valid: if not valid:
logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask) logger.debug("%s didn't become valid, skipping setscene" % nexttask)
self.sq_task_failoutright(nexttask) self.sq_task_failoutright(nexttask)
return True return True
else: else:
self.sqdata.outrightfail.remove(nexttask) self.sqdata.outrightfail.remove(nexttask)
if nexttask in self.sqdata.outrightfail: if nexttask in self.sqdata.outrightfail:
logger.debug(2, 'No package found, so skipping setscene task %s', nexttask) logger.debug2('No package found, so skipping setscene task %s', nexttask)
self.sq_task_failoutright(nexttask) self.sq_task_failoutright(nexttask)
return True return True
if nexttask in self.sqdata.unskippable: if nexttask in self.sqdata.unskippable:
logger.debug(2, "Setscene task %s is unskippable" % nexttask) logger.debug2("Setscene task %s is unskippable" % nexttask)
task = nexttask task = nexttask
break break
if task is not None: if task is not None:
(mc, fn, taskname, taskfn) = split_tid_mcfn(task) (mc, fn, taskname, taskfn) = split_tid_mcfn(task)
taskname = taskname + "_setscene" taskname = taskname + "_setscene"
if self.rq.check_stamp_task(task, taskname_from_tid(task), recurse = True, cache=self.stampcache): if self.rq.check_stamp_task(task, taskname_from_tid(task), recurse = True, cache=self.stampcache):
logger.debug(2, 'Stamp for underlying task %s is current, so skipping setscene variant', task) logger.debug2('Stamp for underlying task %s is current, so skipping setscene variant', task)
self.sq_task_failoutright(task) self.sq_task_failoutright(task)
return True return True
@ -2030,12 +2030,12 @@ class RunQueueExecute:
return True return True
if self.rq.check_stamp_task(task, taskname, cache=self.stampcache): if self.rq.check_stamp_task(task, taskname, cache=self.stampcache):
logger.debug(2, 'Setscene stamp current task %s, so skip it and its dependencies', task) logger.debug2('Setscene stamp current task %s, so skip it and its dependencies', task)
self.sq_task_skip(task) self.sq_task_skip(task)
return True return True
if self.cooker.configuration.skipsetscene: if self.cooker.configuration.skipsetscene:
logger.debug(2, 'No setscene tasks should be executed. Skipping %s', task) logger.debug2('No setscene tasks should be executed. Skipping %s', task)
self.sq_task_failoutright(task) self.sq_task_failoutright(task)
return True return True
@ -2097,12 +2097,12 @@ class RunQueueExecute:
return True return True
if task in self.tasks_covered: if task in self.tasks_covered:
logger.debug(2, "Setscene covered task %s", task) logger.debug2("Setscene covered task %s", task)
self.task_skip(task, "covered") self.task_skip(task, "covered")
return True return True
if self.rq.check_stamp_task(task, taskname, cache=self.stampcache): if self.rq.check_stamp_task(task, taskname, cache=self.stampcache):
logger.debug(2, "Stamp current task %s", task) logger.debug2("Stamp current task %s", task)
self.task_skip(task, "existing") self.task_skip(task, "existing")
self.runq_tasksrun.add(task) self.runq_tasksrun.add(task)
@ -2322,7 +2322,7 @@ class RunQueueExecute:
remapped = True remapped = True
if not remapped: if not remapped:
#logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni)) #logger.debug("Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni))
self.rqdata.runtaskentries[tid].hash = newhash self.rqdata.runtaskentries[tid].hash = newhash
self.rqdata.runtaskentries[tid].unihash = newuni self.rqdata.runtaskentries[tid].unihash = newuni
changed.add(tid) changed.add(tid)
@ -2337,7 +2337,7 @@ class RunQueueExecute:
for mc in self.rq.fakeworker: for mc in self.rq.fakeworker:
self.rq.fakeworker[mc].process.stdin.write(b"<newtaskhashes>" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"</newtaskhashes>") self.rq.fakeworker[mc].process.stdin.write(b"<newtaskhashes>" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"</newtaskhashes>")
hashequiv_logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) hashequiv_logger.debug(pprint.pformat("Tasks changed:\n%s" % (changed)))
for tid in changed: for tid in changed:
if tid not in self.rqdata.runq_setscene_tids: if tid not in self.rqdata.runq_setscene_tids:
@ -2356,7 +2356,7 @@ class RunQueueExecute:
# Check no tasks this covers are running # Check no tasks this covers are running
for dep in self.sqdata.sq_covered_tasks[tid]: for dep in self.sqdata.sq_covered_tasks[tid]:
if dep in self.runq_running and dep not in self.runq_complete: if dep in self.runq_running and dep not in self.runq_complete:
hashequiv_logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) hashequiv_logger.debug2("Task %s is running which blocks setscene for %s from running" % (dep, tid))
valid = False valid = False
break break
if not valid: if not valid:
@ -2430,7 +2430,7 @@ class RunQueueExecute:
for dep in sorted(self.sqdata.sq_deps[task]): for dep in sorted(self.sqdata.sq_deps[task]):
if fail and task in self.sqdata.sq_harddeps and dep in self.sqdata.sq_harddeps[task]: if fail and task in self.sqdata.sq_harddeps and dep in self.sqdata.sq_harddeps[task]:
logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (task, dep)) logger.debug2("%s was unavailable and is a hard dependency of %s so skipping" % (task, dep))
self.sq_task_failoutright(dep) self.sq_task_failoutright(dep)
continue continue
if self.sqdata.sq_revdeps[dep].issubset(self.scenequeue_covered | self.scenequeue_notcovered): if self.sqdata.sq_revdeps[dep].issubset(self.scenequeue_covered | self.scenequeue_notcovered):
@ -2460,7 +2460,7 @@ class RunQueueExecute:
completed dependencies as buildable completed dependencies as buildable
""" """
logger.debug(1, 'Found task %s which could be accelerated', task) logger.debug('Found task %s which could be accelerated', task)
self.scenequeue_covered.add(task) self.scenequeue_covered.add(task)
self.scenequeue_updatecounters(task) self.scenequeue_updatecounters(task)
@ -2775,13 +2775,13 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s
continue continue
if rq.check_stamp_task(tid, taskname + "_setscene", cache=stampcache): if rq.check_stamp_task(tid, taskname + "_setscene", cache=stampcache):
logger.debug(2, 'Setscene stamp current for task %s', tid) logger.debug2('Setscene stamp current for task %s', tid)
sqdata.stamppresent.add(tid) sqdata.stamppresent.add(tid)
sqrq.sq_task_skip(tid) sqrq.sq_task_skip(tid)
continue continue
if rq.check_stamp_task(tid, taskname, recurse = True, cache=stampcache): if rq.check_stamp_task(tid, taskname, recurse = True, cache=stampcache):
logger.debug(2, 'Normal stamp current for task %s', tid) logger.debug2('Normal stamp current for task %s', tid)
sqdata.stamppresent.add(tid) sqdata.stamppresent.add(tid)
sqrq.sq_task_skip(tid) sqrq.sq_task_skip(tid)
continue continue

6
bitbake/lib/bb/siggen.py
View File

@ -541,7 +541,7 @@ class SignatureGeneratorUniHashMixIn(object):
# is much more interesting, so it is reported at debug level 1 # is much more interesting, so it is reported at debug level 1
hashequiv_logger.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) hashequiv_logger.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server))
else: else:
hashequiv_logger.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) hashequiv_logger.debug2('No reported unihash for %s:%s from %s' % (tid, taskhash, self.server))
except hashserv.client.HashConnectionError as e: except hashserv.client.HashConnectionError as e:
bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))
@ -615,12 +615,12 @@ class SignatureGeneratorUniHashMixIn(object):
new_unihash = data['unihash'] new_unihash = data['unihash']
if new_unihash != unihash: if new_unihash != unihash:
hashequiv_logger.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) hashequiv_logger.debug('Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server))
bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d) bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d)
self.set_unihash(tid, new_unihash) self.set_unihash(tid, new_unihash)
d.setVar('BB_UNIHASH', new_unihash) d.setVar('BB_UNIHASH', new_unihash)
else: else:
hashequiv_logger.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) hashequiv_logger.debug('Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server))
except hashserv.client.HashConnectionError as e: except hashserv.client.HashConnectionError as e:
bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))
finally: finally:

42
bitbake/lib/bb/taskdata.py
View File

@ -131,7 +131,7 @@ class TaskData:
for depend in dataCache.deps[fn]: for depend in dataCache.deps[fn]:
dependids.add(depend) dependids.add(depend)
self.depids[fn] = list(dependids) self.depids[fn] = list(dependids)
logger.debug(2, "Added dependencies %s for %s", str(dataCache.deps[fn]), fn) logger.debug2("Added dependencies %s for %s", str(dataCache.deps[fn]), fn)
# Work out runtime dependencies # Work out runtime dependencies
if not fn in self.rdepids: if not fn in self.rdepids:
@ -149,9 +149,9 @@ class TaskData:
rreclist.append(rdepend) rreclist.append(rdepend)
rdependids.add(rdepend) rdependids.add(rdepend)
if rdependlist: if rdependlist:
logger.debug(2, "Added runtime dependencies %s for %s", str(rdependlist), fn) logger.debug2("Added runtime dependencies %s for %s", str(rdependlist), fn)
if rreclist: if rreclist:
logger.debug(2, "Added runtime recommendations %s for %s", str(rreclist), fn) logger.debug2("Added runtime recommendations %s for %s", str(rreclist), fn)
self.rdepids[fn] = list(rdependids) self.rdepids[fn] = list(rdependids)
for dep in self.depids[fn]: for dep in self.depids[fn]:
@ -378,7 +378,7 @@ class TaskData:
for fn in eligible: for fn in eligible:
if fn in self.failed_fns: if fn in self.failed_fns:
continue continue
logger.debug(2, "adding %s to satisfy %s", fn, item) logger.debug2("adding %s to satisfy %s", fn, item)
self.add_build_target(fn, item) self.add_build_target(fn, item)
self.add_tasks(fn, dataCache) self.add_tasks(fn, dataCache)
@ -431,7 +431,7 @@ class TaskData:
for fn in eligible: for fn in eligible:
if fn in self.failed_fns: if fn in self.failed_fns:
continue continue
logger.debug(2, "adding '%s' to satisfy runtime '%s'", fn, item) logger.debug2("adding '%s' to satisfy runtime '%s'", fn, item)
self.add_runtime_target(fn, item) self.add_runtime_target(fn, item)
self.add_tasks(fn, dataCache) self.add_tasks(fn, dataCache)
@ -446,7 +446,7 @@ class TaskData:
return return
if not missing_list: if not missing_list:
missing_list = [] missing_list = []
logger.debug(1, "File '%s' is unbuildable, removing...", fn) logger.debug("File '%s' is unbuildable, removing...", fn)
self.failed_fns.append(fn) self.failed_fns.append(fn)
for target in self.build_targets: for target in self.build_targets:
if fn in self.build_targets[target]: if fn in self.build_targets[target]:
@ -526,7 +526,7 @@ class TaskData:
added = added + 1 added = added + 1
except (bb.providers.NoRProvider, bb.providers.MultipleRProvider): except (bb.providers.NoRProvider, bb.providers.MultipleRProvider):
self.remove_runtarget(target) self.remove_runtarget(target)
logger.debug(1, "Resolved " + str(added) + " extra dependencies") logger.debug("Resolved " + str(added) + " extra dependencies")
if added == 0: if added == 0:
break break
# self.dump_data() # self.dump_data()
@ -549,38 +549,38 @@ class TaskData:
""" """
Dump some debug information on the internal data structures Dump some debug information on the internal data structures
""" """
logger.debug(3, "build_names:") logger.debug3("build_names:")
logger.debug(3, ", ".join(self.build_targets)) logger.debug3(", ".join(self.build_targets))
logger.debug(3, "run_names:") logger.debug3("run_names:")
logger.debug(3, ", ".join(self.run_targets)) logger.debug3(", ".join(self.run_targets))
logger.debug(3, "build_targets:") logger.debug3("build_targets:")
for target in self.build_targets: for target in self.build_targets:
targets = "None" targets = "None"
if target in self.build_targets: if target in self.build_targets:
targets = self.build_targets[target] targets = self.build_targets[target]
logger.debug(3, " %s: %s", target, targets) logger.debug3(" %s: %s", target, targets)
logger.debug(3, "run_targets:") logger.debug3("run_targets:")
for target in self.run_targets: for target in self.run_targets:
targets = "None" targets = "None"
if target in self.run_targets: if target in self.run_targets:
targets = self.run_targets[target] targets = self.run_targets[target]
logger.debug(3, " %s: %s", target, targets) logger.debug3(" %s: %s", target, targets)
logger.debug(3, "tasks:") logger.debug3("tasks:")
for tid in self.taskentries: for tid in self.taskentries:
logger.debug(3, " %s: %s %s %s", logger.debug3(" %s: %s %s %s",
tid, tid,
self.taskentries[tid].idepends, self.taskentries[tid].idepends,
self.taskentries[tid].irdepends, self.taskentries[tid].irdepends,
self.taskentries[tid].tdepends) self.taskentries[tid].tdepends)
logger.debug(3, "dependency ids (per fn):") logger.debug3("dependency ids (per fn):")
for fn in self.depids: for fn in self.depids:
logger.debug(3, " %s: %s", fn, self.depids[fn]) logger.debug3(" %s: %s", fn, self.depids[fn])
logger.debug(3, "runtime dependency ids (per fn):") logger.debug3("runtime dependency ids (per fn):")
for fn in self.rdepids: for fn in self.rdepids:
logger.debug(3, " %s: %s", fn, self.rdepids[fn]) logger.debug3(" %s: %s", fn, self.rdepids[fn])

10
bitbake/lib/bb/ui/buildinfohelper.py
View File

@ -148,14 +148,14 @@ class ORMWrapper(object):
buildrequest = None buildrequest = None
if brbe is not None: if brbe is not None:
# Toaster-triggered build # Toaster-triggered build
logger.debug(1, "buildinfohelper: brbe is %s" % brbe) logger.debug("buildinfohelper: brbe is %s" % brbe)
br, _ = brbe.split(":") br, _ = brbe.split(":")
buildrequest = BuildRequest.objects.get(pk=br) buildrequest = BuildRequest.objects.get(pk=br)
prj = buildrequest.project prj = buildrequest.project
else: else:
# CLI build # CLI build
prj = Project.objects.get_or_create_default_project() prj = Project.objects.get_or_create_default_project()
logger.debug(1, "buildinfohelper: project is not specified, defaulting to %s" % prj) logger.debug("buildinfohelper: project is not specified, defaulting to %s" % prj)
if buildrequest is not None: if buildrequest is not None:
# reuse existing Build object # reuse existing Build object
@ -171,7 +171,7 @@ class ORMWrapper(object):
completed_on=now, completed_on=now,
build_name='') build_name='')
logger.debug(1, "buildinfohelper: build is created %s" % build) logger.debug("buildinfohelper: build is created %s" % build)
if buildrequest is not None: if buildrequest is not None:
buildrequest.build = build buildrequest.build = build
@ -906,7 +906,7 @@ class BuildInfoHelper(object):
self.project = None self.project = None
logger.debug(1, "buildinfohelper: Build info helper inited %s" % vars(self)) logger.debug("buildinfohelper: Build info helper inited %s" % vars(self))
################### ###################
@ -1620,7 +1620,7 @@ class BuildInfoHelper(object):
# if we have a backlog of events, do our best to save them here # if we have a backlog of events, do our best to save them here
if len(self.internal_state['backlog']): if len(self.internal_state['backlog']):
tempevent = self.internal_state['backlog'].pop() tempevent = self.internal_state['backlog'].pop()
logger.debug(1, "buildinfohelper: Saving stored event %s " logger.debug("buildinfohelper: Saving stored event %s "
% tempevent) % tempevent)
self.store_log_event(tempevent,cli_backlog) self.store_log_event(tempevent,cli_backlog)
else: else:

6
bitbake/lib/bb/utils.py
View File

@ -609,7 +609,7 @@ def filter_environment(good_vars):
os.environ["LC_ALL"] = "en_US.UTF-8" os.environ["LC_ALL"] = "en_US.UTF-8"
if removed_vars: if removed_vars:
logger.debug(1, "Removed the following variables from the environment: %s", ", ".join(removed_vars.keys())) logger.debug("Removed the following variables from the environment: %s", ", ".join(removed_vars.keys()))
return removed_vars return removed_vars
@ -1613,12 +1613,12 @@ def export_proxies(d):
def load_plugins(logger, plugins, pluginpath): def load_plugins(logger, plugins, pluginpath):
def load_plugin(name): def load_plugin(name):
logger.debug(1, 'Loading plugin %s' % name) logger.debug('Loading plugin %s' % name)
spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] ) spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] )
if spec: if spec:
return spec.loader.load_module() return spec.loader.load_module()
logger.debug(1, 'Loading plugins from %s...' % pluginpath) logger.debug('Loading plugins from %s...' % pluginpath)
expanded = (glob.glob(os.path.join(pluginpath, '*' + ext)) expanded = (glob.glob(os.path.join(pluginpath, '*' + ext))
for ext in python_extensions) for ext in python_extensions)

2
bitbake/lib/bblayers/layerindex.py
View File

@ -79,7 +79,7 @@ class LayerIndexPlugin(ActionPlugin):
branches = [args.branch] branches = [args.branch]
else: else:
branches = (self.tinfoil.config_data.getVar('LAYERSERIES_CORENAMES') or 'master').split() branches = (self.tinfoil.config_data.getVar('LAYERSERIES_CORENAMES') or 'master').split()
logger.debug(1, 'Trying branches: %s' % branches) logger.debug('Trying branches: %s' % branches)
ignore_layers = [] ignore_layers = []
if args.ignore: if args.ignore:

48
bitbake/lib/layerindexlib/__init__.py
View File

@ -94,7 +94,7 @@ class LayerIndex():
if not param: if not param:
continue continue
item = param.split('=', 1) item = param.split('=', 1)
logger.debug(1, item) logger.debug(item)
param_dict[item[0]] = item[1] param_dict[item[0]] = item[1]
return param_dict return param_dict
@ -123,7 +123,7 @@ class LayerIndex():
up = urlparse(url) up = urlparse(url)
if username: if username:
logger.debug(1, "Configuring authentication for %s..." % url) logger.debug("Configuring authentication for %s..." % url)
password_mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm() password_mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()
password_mgr.add_password(None, "%s://%s" % (up.scheme, up.netloc), username, password) password_mgr.add_password(None, "%s://%s" % (up.scheme, up.netloc), username, password)
handler = urllib.request.HTTPBasicAuthHandler(password_mgr) handler = urllib.request.HTTPBasicAuthHandler(password_mgr)
@ -133,20 +133,20 @@ class LayerIndex():
urllib.request.install_opener(opener) urllib.request.install_opener(opener)
logger.debug(1, "Fetching %s (%s)..." % (url, ["without authentication", "with authentication"][bool(username)])) logger.debug("Fetching %s (%s)..." % (url, ["without authentication", "with authentication"][bool(username)]))
try: try:
res = urlopen(Request(url, headers={'User-Agent': 'Mozilla/5.0 (bitbake/lib/layerindex)'}, unverifiable=True)) res = urlopen(Request(url, headers={'User-Agent': 'Mozilla/5.0 (bitbake/lib/layerindex)'}, unverifiable=True))
except urllib.error.HTTPError as e: except urllib.error.HTTPError as e:
logger.debug(1, "HTTP Error: %s: %s" % (e.code, e.reason)) logger.debug("HTTP Error: %s: %s" % (e.code, e.reason))
logger.debug(1, " Requested: %s" % (url)) logger.debug(" Requested: %s" % (url))
logger.debug(1, " Actual: %s" % (e.geturl())) logger.debug(" Actual: %s" % (e.geturl()))
if e.code == 404: if e.code == 404:
logger.debug(1, "Request not found.") logger.debug("Request not found.")
raise LayerIndexFetchError(url, e) raise LayerIndexFetchError(url, e)
else: else:
logger.debug(1, "Headers:\n%s" % (e.headers)) logger.debug("Headers:\n%s" % (e.headers))
raise LayerIndexFetchError(url, e) raise LayerIndexFetchError(url, e)
except OSError as e: except OSError as e:
error = 0 error = 0
@ -170,7 +170,7 @@ class LayerIndex():
raise LayerIndexFetchError(url, "Unable to fetch OSError exception: %s" % e) raise LayerIndexFetchError(url, "Unable to fetch OSError exception: %s" % e)
finally: finally:
logger.debug(1, "...fetching %s (%s), done." % (url, ["without authentication", "with authentication"][bool(username)])) logger.debug("...fetching %s (%s), done." % (url, ["without authentication", "with authentication"][bool(username)]))
return res return res
@ -205,14 +205,14 @@ The format of the indexURI:
if reload: if reload:
self.indexes = [] self.indexes = []
logger.debug(1, 'Loading: %s' % indexURI) logger.debug('Loading: %s' % indexURI)
if not self.plugins: if not self.plugins:
raise LayerIndexException("No LayerIndex Plugins available") raise LayerIndexException("No LayerIndex Plugins available")
for plugin in self.plugins: for plugin in self.plugins:
# Check if the plugin was initialized # Check if the plugin was initialized
logger.debug(1, 'Trying %s' % plugin.__class__) logger.debug('Trying %s' % plugin.__class__)
if not hasattr(plugin, 'type') or not plugin.type: if not hasattr(plugin, 'type') or not plugin.type:
continue continue
try: try:
@ -220,11 +220,11 @@ The format of the indexURI:
indexEnt = plugin.load_index(indexURI, load) indexEnt = plugin.load_index(indexURI, load)
break break
except LayerIndexPluginUrlError as e: except LayerIndexPluginUrlError as e:
logger.debug(1, "%s doesn't support %s" % (plugin.type, e.url)) logger.debug("%s doesn't support %s" % (plugin.type, e.url))
except NotImplementedError: except NotImplementedError:
pass pass
else: else:
logger.debug(1, "No plugins support %s" % indexURI) logger.debug("No plugins support %s" % indexURI)
raise LayerIndexException("No plugins support %s" % indexURI) raise LayerIndexException("No plugins support %s" % indexURI)
# Mark CONFIG data as something we've added... # Mark CONFIG data as something we've added...
@ -255,19 +255,19 @@ will write out the individual elements split by layer and related components.
for plugin in self.plugins: for plugin in self.plugins:
# Check if the plugin was initialized # Check if the plugin was initialized
logger.debug(1, 'Trying %s' % plugin.__class__) logger.debug('Trying %s' % plugin.__class__)
if not hasattr(plugin, 'type') or not plugin.type: if not hasattr(plugin, 'type') or not plugin.type:
continue continue
try: try:
plugin.store_index(indexURI, index) plugin.store_index(indexURI, index)
break break
except LayerIndexPluginUrlError as e: except LayerIndexPluginUrlError as e:
logger.debug(1, "%s doesn't support %s" % (plugin.type, e.url)) logger.debug("%s doesn't support %s" % (plugin.type, e.url))
except NotImplementedError: except NotImplementedError:
logger.debug(1, "Store not implemented in %s" % plugin.type) logger.debug("Store not implemented in %s" % plugin.type)
pass pass
else: else:
logger.debug(1, "No plugins support %s" % indexURI) logger.debug("No plugins support %s" % indexURI)
raise LayerIndexException("No plugins support %s" % indexURI) raise LayerIndexException("No plugins support %s" % indexURI)
@ -292,7 +292,7 @@ layerBranches set. If not, they are effectively blank.'''
the default configuration until the first vcs_url/branch match.''' the default configuration until the first vcs_url/branch match.'''
for index in self.indexes: for index in self.indexes:
logger.debug(1, ' searching %s' % index.config['DESCRIPTION']) logger.debug(' searching %s' % index.config['DESCRIPTION'])
layerBranch = index.find_vcs_url(vcs_url, [branch]) layerBranch = index.find_vcs_url(vcs_url, [branch])
if layerBranch: if layerBranch:
return layerBranch return layerBranch
@ -304,7 +304,7 @@ layerBranches set. If not, they are effectively blank.'''
If a branch has not been specified, we will iterate over the branches in If a branch has not been specified, we will iterate over the branches in
the default configuration until the first collection/branch match.''' the default configuration until the first collection/branch match.'''
logger.debug(1, 'find_collection: %s (%s) %s' % (collection, version, branch)) logger.debug('find_collection: %s (%s) %s' % (collection, version, branch))
if branch: if branch:
branches = [branch] branches = [branch]
@ -312,12 +312,12 @@ layerBranches set. If not, they are effectively blank.'''
branches = None branches = None
for index in self.indexes: for index in self.indexes:
logger.debug(1, ' searching %s' % index.config['DESCRIPTION']) logger.debug(' searching %s' % index.config['DESCRIPTION'])
layerBranch = index.find_collection(collection, version, branches) layerBranch = index.find_collection(collection, version, branches)
if layerBranch: if layerBranch:
return layerBranch return layerBranch
else: else:
logger.debug(1, 'Collection %s (%s) not found for branch (%s)' % (collection, version, branch)) logger.debug('Collection %s (%s) not found for branch (%s)' % (collection, version, branch))
return None return None
def find_layerbranch(self, name, branch=None): def find_layerbranch(self, name, branch=None):
@ -408,7 +408,7 @@ layerBranches set. If not, they are effectively blank.'''
version=deplayerbranch.version version=deplayerbranch.version
) )
if rdeplayerbranch != deplayerbranch: if rdeplayerbranch != deplayerbranch:
logger.debug(1, 'Replaced %s:%s:%s with %s:%s:%s' % \ logger.debug('Replaced %s:%s:%s with %s:%s:%s' % \
(deplayerbranch.index.config['DESCRIPTION'], (deplayerbranch.index.config['DESCRIPTION'],
deplayerbranch.branch.name, deplayerbranch.branch.name,
deplayerbranch.layer.name, deplayerbranch.layer.name,
@ -1121,7 +1121,7 @@ class LayerBranch(LayerIndexItemObj):
@property @property
def branch(self): def branch(self):
try: try:
logger.debug(1, "Get branch object from branches[%s]" % (self.branch_id)) logger.debug("Get branch object from branches[%s]" % (self.branch_id))
return self.index.branches[self.branch_id] return self.index.branches[self.branch_id]
except KeyError: except KeyError:
raise AttributeError('Unable to find branches in index to map branch_id %s' % self.branch_id) raise AttributeError('Unable to find branches in index to map branch_id %s' % self.branch_id)
@ -1149,7 +1149,7 @@ class LayerBranch(LayerIndexItemObj):
@actual_branch.setter @actual_branch.setter
def actual_branch(self, value): def actual_branch(self, value):
logger.debug(1, "Set actual_branch to %s .. name is %s" % (value, self.branch.name)) logger.debug("Set actual_branch to %s .. name is %s" % (value, self.branch.name))
if value != self.branch.name: if value != self.branch.name:
self._setattr('actual_branch', value, prop=False) self._setattr('actual_branch', value, prop=False)
else: else:

4
bitbake/lib/layerindexlib/cooker.py
View File

@ -173,7 +173,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin):
else: else:
branches = ['HEAD'] branches = ['HEAD']
logger.debug(1, "Loading cooker data branches %s" % branches) logger.debug("Loading cooker data branches %s" % branches)
index = self._load_bblayers(branches=branches) index = self._load_bblayers(branches=branches)
@ -220,7 +220,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin):
required=required, layerbranch=layerBranchId, required=required, layerbranch=layerBranchId,
dependency=depLayerBranch.layer_id) dependency=depLayerBranch.layer_id)
logger.debug(1, '%s requires %s' % (layerDependency.layer.name, layerDependency.dependency.name)) logger.debug('%s requires %s' % (layerDependency.layer.name, layerDependency.dependency.name))
index.add_element("layerDependencies", [layerDependency]) index.add_element("layerDependencies", [layerDependency])
return layerDependencyId return layerDependencyId

32
bitbake/lib/layerindexlib/restapi.py
View File

@ -82,7 +82,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
def load_cache(path, index, branches=[]): def load_cache(path, index, branches=[]):
logger.debug(1, 'Loading json file %s' % path) logger.debug('Loading json file %s' % path)
with open(path, 'rt', encoding='utf-8') as f: with open(path, 'rt', encoding='utf-8') as f:
pindex = json.load(f) pindex = json.load(f)
@ -102,7 +102,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
if newpBranch: if newpBranch:
index.add_raw_element('branches', layerindexlib.Branch, newpBranch) index.add_raw_element('branches', layerindexlib.Branch, newpBranch)
else: else:
logger.debug(1, 'No matching branches (%s) in index file(s)' % branches) logger.debug('No matching branches (%s) in index file(s)' % branches)
# No matching branches.. return nothing... # No matching branches.. return nothing...
return return
@ -120,7 +120,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
load_cache(up.path, index, branches) load_cache(up.path, index, branches)
return index return index
logger.debug(1, 'Loading from dir %s...' % (up.path)) logger.debug('Loading from dir %s...' % (up.path))
for (dirpath, _, filenames) in os.walk(up.path): for (dirpath, _, filenames) in os.walk(up.path):
for filename in filenames: for filename in filenames:
if not filename.endswith('.json'): if not filename.endswith('.json'):
@ -144,7 +144,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
def _get_json_response(apiurl=None, username=None, password=None, retry=True): def _get_json_response(apiurl=None, username=None, password=None, retry=True):
assert apiurl is not None assert apiurl is not None
logger.debug(1, "fetching %s" % apiurl) logger.debug("fetching %s" % apiurl)
up = urlparse(apiurl) up = urlparse(apiurl)
@ -163,9 +163,9 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
parsed = json.loads(res.read().decode('utf-8')) parsed = json.loads(res.read().decode('utf-8'))
except ConnectionResetError: except ConnectionResetError:
if retry: if retry:
logger.debug(1, "%s: Connection reset by peer. Retrying..." % url) logger.debug("%s: Connection reset by peer. Retrying..." % url)
parsed = _get_json_response(apiurl=up_stripped.geturl(), username=username, password=password, retry=False) parsed = _get_json_response(apiurl=up_stripped.geturl(), username=username, password=password, retry=False)
logger.debug(1, "%s: retry successful.") logger.debug("%s: retry successful.")
else: else:
raise layerindexlib.LayerIndexFetchError('%s: Connection reset by peer. Is there a firewall blocking your connection?' % apiurl) raise layerindexlib.LayerIndexFetchError('%s: Connection reset by peer. Is there a firewall blocking your connection?' % apiurl)
@ -207,25 +207,25 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
if "*" not in branches: if "*" not in branches:
filter = "?filter=name:%s" % "OR".join(branches) filter = "?filter=name:%s" % "OR".join(branches)
logger.debug(1, "Loading %s from %s" % (branches, index.apilinks['branches'])) logger.debug("Loading %s from %s" % (branches, index.apilinks['branches']))
# The link won't include username/password, so pull it from the original url # The link won't include username/password, so pull it from the original url
pindex['branches'] = _get_json_response(index.apilinks['branches'] + filter, pindex['branches'] = _get_json_response(index.apilinks['branches'] + filter,
username=up.username, password=up.password) username=up.username, password=up.password)
if not pindex['branches']: if not pindex['branches']:
logger.debug(1, "No valid branches (%s) found at url %s." % (branch, url)) logger.debug("No valid branches (%s) found at url %s." % (branch, url))
return index return index
index.add_raw_element("branches", layerindexlib.Branch, pindex['branches']) index.add_raw_element("branches", layerindexlib.Branch, pindex['branches'])
# Load all of the layerItems (these can not be easily filtered) # Load all of the layerItems (these can not be easily filtered)
logger.debug(1, "Loading %s from %s" % ('layerItems', index.apilinks['layerItems'])) logger.debug("Loading %s from %s" % ('layerItems', index.apilinks['layerItems']))
# The link won't include username/password, so pull it from the original url # The link won't include username/password, so pull it from the original url
pindex['layerItems'] = _get_json_response(index.apilinks['layerItems'], pindex['layerItems'] = _get_json_response(index.apilinks['layerItems'],
username=up.username, password=up.password) username=up.username, password=up.password)
if not pindex['layerItems']: if not pindex['layerItems']:
logger.debug(1, "No layers were found at url %s." % (url)) logger.debug("No layers were found at url %s." % (url))
return index return index
index.add_raw_element("layerItems", layerindexlib.LayerItem, pindex['layerItems']) index.add_raw_element("layerItems", layerindexlib.LayerItem, pindex['layerItems'])
@ -235,13 +235,13 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
for branch in index.branches: for branch in index.branches:
filter = "?filter=branch__name:%s" % index.branches[branch].name filter = "?filter=branch__name:%s" % index.branches[branch].name
logger.debug(1, "Loading %s from %s" % ('layerBranches', index.apilinks['layerBranches'])) logger.debug("Loading %s from %s" % ('layerBranches', index.apilinks['layerBranches']))
# The link won't include username/password, so pull it from the original url # The link won't include username/password, so pull it from the original url
pindex['layerBranches'] = _get_json_response(index.apilinks['layerBranches'] + filter, pindex['layerBranches'] = _get_json_response(index.apilinks['layerBranches'] + filter,
username=up.username, password=up.password) username=up.username, password=up.password)
if not pindex['layerBranches']: if not pindex['layerBranches']:
logger.debug(1, "No valid layer branches (%s) found at url %s." % (branches or "*", url)) logger.debug("No valid layer branches (%s) found at url %s." % (branches or "*", url))
return index return index
index.add_raw_element("layerBranches", layerindexlib.LayerBranch, pindex['layerBranches']) index.add_raw_element("layerBranches", layerindexlib.LayerBranch, pindex['layerBranches'])
@ -256,7 +256,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
("distros", layerindexlib.Distro)]: ("distros", layerindexlib.Distro)]:
if lName not in load: if lName not in load:
continue continue
logger.debug(1, "Loading %s from %s" % (lName, index.apilinks[lName])) logger.debug("Loading %s from %s" % (lName, index.apilinks[lName]))
# The link won't include username/password, so pull it from the original url # The link won't include username/password, so pull it from the original url
pindex[lName] = _get_json_response(index.apilinks[lName] + filter, pindex[lName] = _get_json_response(index.apilinks[lName] + filter,
@ -283,7 +283,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
if up.scheme != 'file': if up.scheme != 'file':
raise layerindexlib.plugin.LayerIndexPluginUrlError(self.type, url) raise layerindexlib.plugin.LayerIndexPluginUrlError(self.type, url)
logger.debug(1, "Storing to %s..." % up.path) logger.debug("Storing to %s..." % up.path)
try: try:
layerbranches = index.layerBranches layerbranches = index.layerBranches
@ -299,12 +299,12 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
if getattr(index, objects)[obj].layerbranch_id == layerbranchid: if getattr(index, objects)[obj].layerbranch_id == layerbranchid:
filtered.append(getattr(index, objects)[obj]._data) filtered.append(getattr(index, objects)[obj]._data)
except AttributeError: except AttributeError:
logger.debug(1, 'No obj.layerbranch_id: %s' % objects) logger.debug('No obj.layerbranch_id: %s' % objects)
# No simple filter method, just include it... # No simple filter method, just include it...
try: try:
filtered.append(getattr(index, objects)[obj]._data) filtered.append(getattr(index, objects)[obj]._data)
except AttributeError: except AttributeError:
logger.debug(1, 'No obj._data: %s %s' % (objects, type(obj))) logger.debug('No obj._data: %s %s' % (objects, type(obj)))
filtered.append(obj) filtered.append(obj)
return filtered return filtered

4
bitbake/lib/layerindexlib/tests/cooker.py
View File

@ -72,7 +72,7 @@ class LayerIndexCookerTest(LayersTest):
def test_find_collection(self): def test_find_collection(self):
def _check(collection, expected): def _check(collection, expected):
self.logger.debug(1, "Looking for collection %s..." % collection) self.logger.debug("Looking for collection %s..." % collection)
result = self.layerindex.find_collection(collection) result = self.layerindex.find_collection(collection)
if expected: if expected:
self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection)
@ -91,7 +91,7 @@ class LayerIndexCookerTest(LayersTest):
def test_find_layerbranch(self): def test_find_layerbranch(self):
def _check(name, expected): def _check(name, expected):
self.logger.debug(1, "Looking for layerbranch %s..." % name) self.logger.debug("Looking for layerbranch %s..." % name)
result = self.layerindex.find_layerbranch(name) result = self.layerindex.find_layerbranch(name)
if expected: if expected:
self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection)

18
bitbake/lib/layerindexlib/tests/restapi.py
View File

@ -57,11 +57,11 @@ class LayerIndexWebRestApiTest(LayersTest):
type in self.layerindex.indexes[0].config['local']: type in self.layerindex.indexes[0].config['local']:
continue continue
for id in getattr(self.layerindex.indexes[0], type): for id in getattr(self.layerindex.indexes[0], type):
self.logger.debug(1, "type %s" % (type)) self.logger.debug("type %s" % (type))
self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number not in reloaded index") self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number not in reloaded index")
self.logger.debug(1, "%s ? %s" % (getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id])) self.logger.debug("%s ? %s" % (getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id]))
self.assertEqual(getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id], msg="Reloaded contents different") self.assertEqual(getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id], msg="Reloaded contents different")
@ -80,11 +80,11 @@ class LayerIndexWebRestApiTest(LayersTest):
type in self.layerindex.indexes[0].config['local']: type in self.layerindex.indexes[0].config['local']:
continue continue
for id in getattr(self.layerindex.indexes[0] ,type): for id in getattr(self.layerindex.indexes[0] ,type):
self.logger.debug(1, "type %s" % (type)) self.logger.debug("type %s" % (type))
self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number missing from reloaded data") self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number missing from reloaded data")
self.logger.debug(1, "%s ? %s" % (getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id])) self.logger.debug("%s ? %s" % (getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id]))
self.assertEqual(getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id], msg="reloaded data does not match original") self.assertEqual(getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id], msg="reloaded data does not match original")
@ -111,14 +111,14 @@ class LayerIndexWebRestApiTest(LayersTest):
if dep.layer.name == 'meta-python': if dep.layer.name == 'meta-python':
break break
else: else:
self.logger.debug(1, "meta-python was not found") self.logger.debug("meta-python was not found")
raise self.failureException raise self.failureException
# Only check the first element... # Only check the first element...
break break
else: else:
# Empty list, this is bad. # Empty list, this is bad.
self.logger.debug(1, "Empty list of dependencies") self.logger.debug("Empty list of dependencies")
self.assertIsNotNone(first, msg="Empty list of dependencies") self.assertIsNotNone(first, msg="Empty list of dependencies")
# Last dep should be the requested item # Last dep should be the requested item
@ -128,7 +128,7 @@ class LayerIndexWebRestApiTest(LayersTest):
@skipIfNoNetwork() @skipIfNoNetwork()
def test_find_collection(self): def test_find_collection(self):
def _check(collection, expected): def _check(collection, expected):
self.logger.debug(1, "Looking for collection %s..." % collection) self.logger.debug("Looking for collection %s..." % collection)
result = self.layerindex.find_collection(collection) result = self.layerindex.find_collection(collection)
if expected: if expected:
self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection)
@ -148,11 +148,11 @@ class LayerIndexWebRestApiTest(LayersTest):
@skipIfNoNetwork() @skipIfNoNetwork()
def test_find_layerbranch(self): def test_find_layerbranch(self):
def _check(name, expected): def _check(name, expected):
self.logger.debug(1, "Looking for layerbranch %s..." % name) self.logger.debug("Looking for layerbranch %s..." % name)
for index in self.layerindex.indexes: for index in self.layerindex.indexes:
for layerbranchid in index.layerBranches: for layerbranchid in index.layerBranches:
self.logger.debug(1, "Present: %s" % index.layerBranches[layerbranchid].layer.name) self.logger.debug("Present: %s" % index.layerBranches[layerbranchid].layer.name)
result = self.layerindex.find_layerbranch(name) result = self.layerindex.find_layerbranch(name)
if expected: if expected:
self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection)