From 56cd778eb021a3632aa6b2cb1ec53182512fd38e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 11 May 2014 13:05:40 +0100 Subject: bitbake: parse: Improve file inheritance logging The file inheritance logging has been here since the dawn of time. It duplicates output many times over and logs to debug level 2. When running with the debug option, its understandable the user may want to see the paths of files included in the build. These changes remove pointless/duplicate output and print the include paths clearly at debug level one in a form which users should be able to more easily parse. (Bitbake rev: 633a56987df639295fe9128418da5634050063e5) Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/__init__.py | 1 - bitbake/lib/bb/parse/parse_py/BBHandler.py | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'bitbake/lib/bb/parse') diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index e4a44dda11..bf5ed05e7f 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py @@ -121,7 +121,6 @@ def resolve_file(fn, d): if not os.path.isfile(fn): raise IOError("file %s not found" % fn) - logger.debug(2, "LOAD %s", fn) return fn # Used by OpenEmbedded metadata diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 408890e48a..a8627e9c07 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -86,7 +86,7 @@ def inherit(files, fn, lineno, d): file = abs_fn if not file in __inherit_cache: - logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file) + logger.debug(1, "Inheriting %s (from %s:%d)" % (file, fn, lineno)) __inherit_cache.append( file ) d.setVar('__inherit_cache', __inherit_cache) include(fn, file, lineno, d, "inherit") @@ -124,12 +124,6 @@ def handle(fn, d, include): __classname__ = "" __residue__ = [] - - if include == 0: - logger.debug(2, "BB %s: handle(data)", fn) - else: - logger.debug(2, "BB %s: handle(data, include)", fn) - base_name = os.path.basename(fn) (root, ext) = os.path.splitext(base_name) init(d) -- cgit v1.2.3-54-g00ecf