diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-13 17:01:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-15 10:06:22 +0000 |
commit | eb6291b36fd9206aec0476852042a18113039317 (patch) | |
tree | 9622c21183d5c34ee1aaed441d544dbc051606e1 /bitbake/lib/bb/ui | |
parent | ecdfc1ebbe260fc7b2842b751d913580d294cb42 (diff) | |
download | poky-eb6291b36fd9206aec0476852042a18113039317.tar.gz |
bitbake/knotty: avoid printing full task log when error already printed
If a task has logged an ERROR then don't print the contents of the
task's log file in knotty (the default terminal UI).
As a side-effect we now also respect BBINCLUDELOGS in knotty; if it is
false we never print the log (but the pointer to the log file is always
printed).
(Bitbake rev: b9746b7e4d7aa5c34eba15a61427bfc6949af123)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 5366386b20..205a8d8f39 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -142,7 +142,7 @@ def main(server, eventHandler): | |||
142 | logfile = event.logfile | 142 | logfile = event.logfile |
143 | if logfile and os.path.exists(logfile): | 143 | if logfile and os.path.exists(logfile): |
144 | print("ERROR: Logfile of failure stored in: %s" % logfile) | 144 | print("ERROR: Logfile of failure stored in: %s" % logfile) |
145 | if 1 or includelogs: | 145 | if includelogs and not event.errprinted: |
146 | print("Log data follows:") | 146 | print("Log data follows:") |
147 | f = open(logfile, "r") | 147 | f = open(logfile, "r") |
148 | lines = [] | 148 | lines = [] |