From: Chris Larson <chris_larson@mentor.com>
Date: Tue, 28 Sep 2010 15:52:32 +0000 (-0700)
Subject: Fix syntax issue and don't include 'd' in ui_queue
X-Git-Tag: 2011-1~3150
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c81cd1be64a6d8c725fc7323d040ed2fad41c826;p=openembedded-core.git

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>
---

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:
             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 fb355089a3..5f292bccbc 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 = []