summaryrefslogtreecommitdiff
path: root/bitbake/lib
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-09-28 08:52:32 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:37 +0000
commitc81cd1be64a6d8c725fc7323d040ed2fad41c826 (patch)
tree878db3ca9fa00af9df7d5145c80330085d3c91cc /bitbake/lib
parent26eda933379801ef1c8b4b09e67d14f498cd3813 (diff)
downloadopenembedded-core-c81cd1be64a6d8c725fc7323d040ed2fad41c826.tar.gz
openembedded-core-c81cd1be64a6d8c725fc7323d040ed2fad41c826.tar.bz2
openembedded-core-c81cd1be64a6d8c725fc7323d040ed2fad41c826.tar.xz
openembedded-core-c81cd1be64a6d8c725fc7323d040ed2fad41c826.zip
Fix syntax issue and don't include 'd' in ui_queue
(Bitbake rev: bed8e09971dc577f5443ad3d89aa14634c54eb16) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py4
-rw-r--r--bitbake/lib/bb/event.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7adda09fd..90366cd76 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -494,9 +494,9 @@ class BBCooker:
path, _ = os.path.split(path)
def parseConfigurationFiles(self, files):
- def _parse(f, data):
+ def _parse(f, data, include=False):
try:
- return bb.parse.handle(f, data)
+ return bb.parse.handle(f, data, include)
except (IOError, bb.parse.ParseError) as exc:
parselog.critical("Unable to parse %s: %s" % (f, exc))
sys.exit(1)
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index fb355089a..5f292bccb 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -86,14 +86,14 @@ def print_ui_queue():
console.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
logger.handlers = [console]
while ui_queue:
- event, d = ui_queue.pop()
+ event = ui_queue.pop()
if isinstance(event, logging.LogRecord):
logger.handle(event)
def fire_ui_handlers(event, d):
if not _ui_handlers:
# No UI handlers registered yet, queue up the messages
- ui_queue.append((event, d))
+ ui_queue.append(event)
return
errors = []