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/utils.py | |
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/utils.py')
-rw-r--r-- | bitbake/lib/bb/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 5c775bd8a8..b282d09abf 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
@@ -609,7 +609,7 @@ def filter_environment(good_vars): | |||
609 | os.environ["LC_ALL"] = "en_US.UTF-8" | 609 | os.environ["LC_ALL"] = "en_US.UTF-8" |
610 | 610 | ||
611 | if removed_vars: | 611 | if removed_vars: |
612 | logger.debug(1, "Removed the following variables from the environment: %s", ", ".join(removed_vars.keys())) | 612 | logger.debug("Removed the following variables from the environment: %s", ", ".join(removed_vars.keys())) |
613 | 613 | ||
614 | return removed_vars | 614 | return removed_vars |
615 | 615 | ||
@@ -1613,12 +1613,12 @@ def export_proxies(d): | |||
1613 | 1613 | ||
1614 | def load_plugins(logger, plugins, pluginpath): | 1614 | def load_plugins(logger, plugins, pluginpath): |
1615 | def load_plugin(name): | 1615 | def load_plugin(name): |
1616 | logger.debug(1, 'Loading plugin %s' % name) | 1616 | logger.debug('Loading plugin %s' % name) |
1617 | spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] ) | 1617 | spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] ) |
1618 | if spec: | 1618 | if spec: |
1619 | return spec.loader.load_module() | 1619 | return spec.loader.load_module() |
1620 | 1620 | ||
1621 | logger.debug(1, 'Loading plugins from %s...' % pluginpath) | 1621 | logger.debug('Loading plugins from %s...' % pluginpath) |
1622 | 1622 | ||
1623 | expanded = (glob.glob(os.path.join(pluginpath, '*' + ext)) | 1623 | expanded = (glob.glob(os.path.join(pluginpath, '*' + ext)) |
1624 | for ext in python_extensions) | 1624 | for ext in python_extensions) |