cooker: show a useful message for ParsingFailure

(Bitbake rev: a41c217c6e9195f8b9ea2de6e1d335b10b904558)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index fab65c22d5b5b173a786811f67c02d9da8141068..ef42f02dabc7a70e04433291e01434270b844a99 100644 (file)
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -33,7 +33,7 @@ import sre_constants
 import threading
 from cStringIO import StringIO
 from contextlib import closing
-import bb
+import bb, bb.exceptions
 from bb import utils, data, parse, event, cache, providers, taskdata, command, runqueue
 
 logger      = logging.getLogger("BitBake")
@@ -1122,8 +1122,7 @@ class ParsingFailure(Exception):
     def __init__(self, realexception, recipe):
         self.realexception = realexception
         self.recipe = recipe
-        Exception.__init__(self, "Failure when parsing %s" % recipe)
-        self.args = (realexception, recipe)
+        Exception.__init__(self, realexception, recipe)
 
 def parse_file(task):
     filename, appends, caches_array = task
@@ -1216,6 +1215,10 @@ class CookerParser(object):
         except KeyboardInterrupt:
             self.shutdown(clean=False)
             raise
+        except ParsingFailure as exc:
+            self.shutdown(clean=False)
+            bb.fatal('Error parsing %s: %s' %
+                     (exc.recipe, bb.exceptions.to_string(exc.realexception)))
         except Exception as exc:
             self.shutdown(clean=False)
             bb.fatal('Error parsing %s: %s' % (exc.recipe, exc))