diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 13:05:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 13:15:12 +0100 |
commit | 56cd778eb021a3632aa6b2cb1ec53182512fd38e (patch) | |
tree | 665bdfd93dcc18c15999dd04e87f578d9e16c16a /bitbake/lib/bb/parse | |
parent | c0bdb8100f44f08cc1bc880792d0ea52f8ba1bf8 (diff) | |
download | poky-56cd778eb021a3632aa6b2cb1ec53182512fd38e.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 1 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 8 |
2 files changed, 1 insertions, 8 deletions
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): | |||
121 | if not os.path.isfile(fn): | 121 | if not os.path.isfile(fn): |
122 | raise IOError("file %s not found" % fn) | 122 | raise IOError("file %s not found" % fn) |
123 | 123 | ||
124 | logger.debug(2, "LOAD %s", fn) | ||
125 | return fn | 124 | return fn |
126 | 125 | ||
127 | # Used by OpenEmbedded metadata | 126 | # 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): | |||
86 | file = abs_fn | 86 | file = abs_fn |
87 | 87 | ||
88 | if not file in __inherit_cache: | 88 | if not file in __inherit_cache: |
89 | logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file) | 89 | logger.debug(1, "Inheriting %s (from %s:%d)" % (file, fn, lineno)) |
90 | __inherit_cache.append( file ) | 90 | __inherit_cache.append( file ) |
91 | d.setVar('__inherit_cache', __inherit_cache) | 91 | d.setVar('__inherit_cache', __inherit_cache) |
92 | include(fn, file, lineno, d, "inherit") | 92 | include(fn, file, lineno, d, "inherit") |
@@ -124,12 +124,6 @@ def handle(fn, d, include): | |||
124 | __classname__ = "" | 124 | __classname__ = "" |
125 | __residue__ = [] | 125 | __residue__ = [] |
126 | 126 | ||
127 | |||
128 | if include == 0: | ||
129 | logger.debug(2, "BB %s: handle(data)", fn) | ||
130 | else: | ||
131 | logger.debug(2, "BB %s: handle(data, include)", fn) | ||
132 | |||
133 | base_name = os.path.basename(fn) | 127 | base_name = os.path.basename(fn) |
134 | (root, ext) = os.path.splitext(base_name) | 128 | (root, ext) = os.path.splitext(base_name) |
135 | init(d) | 129 | init(d) |