summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-17 17:30:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-19 11:26:12 +0000
commit17c60cc27b9f2ace94cbb1110953361f147d6242 (patch)
treeb41e73c8b91b39a24cd6d9935dbfd959e05b31e3
parent06b2c82a436c0806d6d1dc0ef3828fdc82f19576 (diff)
downloadpoky-17c60cc27b9f2ace94cbb1110953361f147d6242.tar.gz
bitbake: cooker: Reset loghandler
When parsing, reset the loghandler when finished, else the messages can be misleading. (Bitbake rev: 7af80cd1dd577b05d39a3cc5d5c547a2549e39df) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a05630d52d..2d937a413c 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1949,6 +1949,7 @@ class Parser(multiprocessing.Process):
1949 1949
1950 def parse(self, filename, appends): 1950 def parse(self, filename, appends):
1951 try: 1951 try:
1952 origfilter = bb.event.LogHandler.filter
1952 # Record the filename we're parsing into any events generated 1953 # Record the filename we're parsing into any events generated
1953 def parse_filter(self, record): 1954 def parse_filter(self, record):
1954 record.taskpid = bb.event.worker_pid 1955 record.taskpid = bb.event.worker_pid
@@ -1971,6 +1972,8 @@ class Parser(multiprocessing.Process):
1971 # a SystemExit event for example. 1972 # a SystemExit event for example.
1972 except BaseException as exc: 1973 except BaseException as exc:
1973 return True, ParsingFailure(exc, filename) 1974 return True, ParsingFailure(exc, filename)
1975 finally:
1976 bb.event.LogHandler.filter = origfilter
1974 1977
1975class CookerParser(object): 1978class CookerParser(object):
1976 def __init__(self, cooker, filelist, masked): 1979 def __init__(self, cooker, filelist, masked):