diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2016-10-14 10:48:39 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-15 10:01:44 +0100 |
commit | 924ca1037c86b9e18ebe9f473df134162ccd570d (patch) | |
tree | 3f7c41c0fcb58fd24f9a8e55f17c97710163de7a /bitbake | |
parent | 24abb881962816bc1c0ea090897c7e98113fba5d (diff) | |
download | poky-924ca1037c86b9e18ebe9f473df134162ccd570d.tar.gz |
bitbake: bb.event: fix infinite loop on print_ui_queue
If bitbake ends before _uiready and bb.event.LogHandler was add
to the bitbake logger it causes an infinite loop when logging
something.
The scenario is print_ui_queue is called at exit and executes
the log handlers [2] one of them is bb.event.LogHandler this handler
appends the same entry to ui_queue causing the inifine loop [3].
In order to fix a new copy of the ui_queue list is created when iterate
ui_queue.
[YOCTO #10399]
[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=10399#c0
[2] http://git.openembedded.org/bitbake/tree/lib/bb/event.py?id=41d9cd41d40b04746c82b4a940dca47df02514fc#n156
[3]
http://git.openembedded.org/bitbake/tree/lib/bb/event.py?id=41d9cd41d40b04746c82b4a940dca47df02514fc#n164
(Bitbake rev: 46fecca9d531a07788b5cac8b2dc6a8267d8b6d0)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/event.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index c5a5f94dee..6f1cb101fc 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py | |||
@@ -139,7 +139,7 @@ def print_ui_queue(): | |||
139 | 139 | ||
140 | # First check to see if we have any proper messages | 140 | # First check to see if we have any proper messages |
141 | msgprint = False | 141 | msgprint = False |
142 | for event in ui_queue: | 142 | for event in ui_queue[:]: |
143 | if isinstance(event, logging.LogRecord): | 143 | if isinstance(event, logging.LogRecord): |
144 | if event.levelno > logging.DEBUG: | 144 | if event.levelno > logging.DEBUG: |
145 | if event.levelno >= logging.WARNING: | 145 | if event.levelno >= logging.WARNING: |
@@ -153,7 +153,7 @@ def print_ui_queue(): | |||
153 | 153 | ||
154 | # Nope, so just print all of the messages we have (including debug messages) | 154 | # Nope, so just print all of the messages we have (including debug messages) |
155 | logger.addHandler(stdout) | 155 | logger.addHandler(stdout) |
156 | for event in ui_queue: | 156 | for event in ui_queue[:]: |
157 | if isinstance(event, logging.LogRecord): | 157 | if isinstance(event, logging.LogRecord): |
158 | logger.handle(event) | 158 | logger.handle(event) |
159 | 159 | ||