diff options
-rw-r--r-- | bitbake/lib/bb/cooker.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/event.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 7adda09fde..90366cd76c 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -494,9 +494,9 @@ class BBCooker: | |||
494 | path, _ = os.path.split(path) | 494 | path, _ = os.path.split(path) |
495 | 495 | ||
496 | def parseConfigurationFiles(self, files): | 496 | def parseConfigurationFiles(self, files): |
497 | def _parse(f, data): | 497 | def _parse(f, data, include=False): |
498 | try: | 498 | try: |
499 | return bb.parse.handle(f, data) | 499 | return bb.parse.handle(f, data, include) |
500 | except (IOError, bb.parse.ParseError) as exc: | 500 | except (IOError, bb.parse.ParseError) as exc: |
501 | parselog.critical("Unable to parse %s: %s" % (f, exc)) | 501 | parselog.critical("Unable to parse %s: %s" % (f, exc)) |
502 | sys.exit(1) | 502 | sys.exit(1) |
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index fb355089a3..5f292bccbc 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py | |||
@@ -86,14 +86,14 @@ def print_ui_queue(): | |||
86 | console.setFormatter(logging.Formatter("%(levelname)s: %(message)s")) | 86 | console.setFormatter(logging.Formatter("%(levelname)s: %(message)s")) |
87 | logger.handlers = [console] | 87 | logger.handlers = [console] |
88 | while ui_queue: | 88 | while ui_queue: |
89 | event, d = ui_queue.pop() | 89 | event = ui_queue.pop() |
90 | if isinstance(event, logging.LogRecord): | 90 | if isinstance(event, logging.LogRecord): |
91 | logger.handle(event) | 91 | logger.handle(event) |
92 | 92 | ||
93 | def fire_ui_handlers(event, d): | 93 | def fire_ui_handlers(event, d): |
94 | if not _ui_handlers: | 94 | if not _ui_handlers: |
95 | # No UI handlers registered yet, queue up the messages | 95 | # No UI handlers registered yet, queue up the messages |
96 | ui_queue.append((event, d)) | 96 | ui_queue.append(event) |
97 | return | 97 | return |
98 | 98 | ||
99 | errors = [] | 99 | errors = [] |