diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2021-02-09 09:50:21 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-10 23:48:16 +0000 |
commit | 75f87db413f3659fee18eff389b7b339b01cce15 (patch) | |
tree | e733135549b516c72c4f34172b6bbf865377fc76 /bitbake/lib/bb/parse | |
parent | 7283a0b3b6ca49d0d2e13593333a580ef10439a8 (diff) | |
download | poky-75f87db413f3659fee18eff389b7b339b01cce15.tar.gz |
bitbake: logging: Make bitbake logger compatible with python logger
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>
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 76e180b411..c01807ba87 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py | |||
@@ -71,7 +71,7 @@ def update_mtime(f): | |||
71 | 71 | ||
72 | def update_cache(f): | 72 | def update_cache(f): |
73 | if f in __mtime_cache: | 73 | if f in __mtime_cache: |
74 | logger.debug(1, "Updating mtime cache for %s" % f) | 74 | logger.debug("Updating mtime cache for %s" % f) |
75 | update_mtime(f) | 75 | update_mtime(f) |
76 | 76 | ||
77 | def clear_cache(): | 77 | def clear_cache(): |
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 0714296af2..0596993d01 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -34,7 +34,7 @@ class IncludeNode(AstNode): | |||
34 | Include the file and evaluate the statements | 34 | Include the file and evaluate the statements |
35 | """ | 35 | """ |
36 | s = data.expand(self.what_file) | 36 | s = data.expand(self.what_file) |
37 | logger.debug(2, "CONF %s:%s: including %s", self.filename, self.lineno, s) | 37 | logger.debug2("CONF %s:%s: including %s", self.filename, self.lineno, s) |
38 | 38 | ||
39 | # TODO: Cache those includes... maybe not here though | 39 | # TODO: Cache those includes... maybe not here though |
40 | if self.force: | 40 | if self.force: |
@@ -376,7 +376,7 @@ def _create_variants(datastores, names, function, onlyfinalise): | |||
376 | def multi_finalize(fn, d): | 376 | def multi_finalize(fn, d): |
377 | appends = (d.getVar("__BBAPPEND") or "").split() | 377 | appends = (d.getVar("__BBAPPEND") or "").split() |
378 | for append in appends: | 378 | for append in appends: |
379 | logger.debug(1, "Appending .bbappend file %s to %s", append, fn) | 379 | logger.debug("Appending .bbappend file %s to %s", append, fn) |
380 | bb.parse.BBHandler.handle(append, d, True) | 380 | bb.parse.BBHandler.handle(append, d, True) |
381 | 381 | ||
382 | onlyfinalise = d.getVar("__ONLYFINALISE", False) | 382 | onlyfinalise = d.getVar("__ONLYFINALISE", False) |
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 7fc162995f..f8988b8631 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -60,7 +60,7 @@ def inherit(files, fn, lineno, d): | |||
60 | file = abs_fn | 60 | file = abs_fn |
61 | 61 | ||
62 | if not file in __inherit_cache: | 62 | if not file in __inherit_cache: |
63 | logger.debug(1, "Inheriting %s (from %s:%d)" % (file, fn, lineno)) | 63 | logger.debug("Inheriting %s (from %s:%d)" % (file, fn, lineno)) |
64 | __inherit_cache.append( file ) | 64 | __inherit_cache.append( file ) |
65 | d.setVar('__inherit_cache', __inherit_cache) | 65 | d.setVar('__inherit_cache', __inherit_cache) |
66 | include(fn, file, lineno, d, "inherit") | 66 | include(fn, file, lineno, d, "inherit") |
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index af64d3446e..f171c5c932 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -95,7 +95,7 @@ def include_single_file(parentfn, fn, lineno, data, error_out): | |||
95 | if exc.errno == errno.ENOENT: | 95 | if exc.errno == errno.ENOENT: |
96 | if error_out: | 96 | if error_out: |
97 | raise ParseError("Could not %s file %s" % (error_out, fn), parentfn, lineno) | 97 | raise ParseError("Could not %s file %s" % (error_out, fn), parentfn, lineno) |
98 | logger.debug(2, "CONF file '%s' not found", fn) | 98 | logger.debug2("CONF file '%s' not found", fn) |
99 | else: | 99 | else: |
100 | if error_out: | 100 | if error_out: |
101 | raise ParseError("Could not %s file %s: %s" % (error_out, fn, exc.strerror), parentfn, lineno) | 101 | raise ParseError("Could not %s file %s: %s" % (error_out, fn, exc.strerror), parentfn, lineno) |