mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up bitbake logging compatibility

Browse Source 
Bitbake changed the debug() logging call to make it compatible with
standard python logging by no longer including a debug level as the
first argument. Fix up the few places this was being used.

Tweaked version of a patch from Joshua Watt.

(From OE-Core rev: 5aecb6df67b876aa12eec54998f209d084579599)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-02-10 10:12:40 +00:00
parent 7f4d057585
commit 0b9711efcb
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/lib/oe/terminal.py
View File

@@ -185,7 +185,7 @@ class Custom(Terminal):
Terminal.__init__(self, sh_cmd, title, env, d) Terminal.__init__(self, sh_cmd, title, env, d)
logger.warning('Custom terminal was started.') logger.warning('Custom terminal was started.')
else: else:
logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set') logger.debug('No custom terminal (OE_TERMINAL_CUSTOMCMD) set')
raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set') raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set')
@@ -216,7 +216,7 @@ def spawn_preferred(sh_cmd, title=None, env=None, d=None):
def spawn(name, sh_cmd, title=None, env=None, d=None): def spawn(name, sh_cmd, title=None, env=None, d=None):
"""Spawn the specified terminal, by name""" """Spawn the specified terminal, by name"""
logger.debug(1, 'Attempting to spawn terminal "%s"', name) logger.debug('Attempting to spawn terminal "%s"', name)
try: try:
terminal = Registry.registry[name] terminal = Registry.registry[name]
except KeyError: except KeyError:

20
meta/lib/oeqa/utils/__init__.py
View File

@@ -43,28 +43,12 @@ def make_logger_bitbake_compatible(logger):
import logging import logging
""" """
Bitbake logger redifines debug() in order to We need to raise the log level of the info output so unittest
set a level within debug, this breaks compatibility messages are visible on the console.
with vainilla logging, so we neeed to redifine debug()
method again also add info() method with INFO + 1 level.
""" """
def _bitbake_log_debug(*args, **kwargs):
lvl = logging.DEBUG
if isinstance(args[0], int):
lvl = args[0]
msg = args[1]
args = args[2:]
else:
msg = args[0]
args = args[1:]
logger.log(lvl, msg, *args, **kwargs)
def _bitbake_log_info(msg, *args, **kwargs): def _bitbake_log_info(msg, *args, **kwargs):
logger.log(logging.INFO + 1, msg, *args, **kwargs) logger.log(logging.INFO + 1, msg, *args, **kwargs)
logger.debug = _bitbake_log_debug
logger.info = _bitbake_log_info logger.info = _bitbake_log_info
return logger return logger

4
meta/lib/oeqa/utils/package_manager.py
View File

@@ -117,7 +117,7 @@ def extract_packages(d, needed_packages):
extract = package.get('extract', True) extract = package.get('extract', True)
if extract: if extract:
#logger.debug(1, 'Extracting %s' % pkg) #logger.debug('Extracting %s' % pkg)
dst_dir = os.path.join(extracted_path, pkg) dst_dir = os.path.join(extracted_path, pkg)
# Same package used for more than one test, # Same package used for more than one test,
# don't need to extract again. # don't need to extract again.
@@ -130,7 +130,7 @@ def extract_packages(d, needed_packages):
shutil.rmtree(pkg_dir) shutil.rmtree(pkg_dir)
else: else:
#logger.debug(1, 'Copying %s' % pkg) #logger.debug('Copying %s' % pkg)
_copy_package(d, pkg) _copy_package(d, pkg)
def _extract_in_tmpdir(d, pkg): def _extract_in_tmpdir(d, pkg):