cooker: don't swallow recipe parse errors

(Bitbake rev: 1f5d49ce64e5e1c7705edbfa3c8e19649c21edd2)

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 8ac88b99a4e68afaa125507379e0f62eed156ddd..7a9b1d58d67fc88ca12b329760ec653bfff469d8 100644 (file)
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -965,7 +965,11 @@ class CookerExit(bb.event.Event):
 
 def parse_file(task):
     filename, appends = task
-    return True, bb.cache.Cache.parse(filename, appends, parse_file.cfg)
+    try:
+        return True, bb.cache.Cache.parse(filename, appends, parse_file.cfg)
+    except Exception, exc:
+        exc.recipe = filename
+        raise exc
 
 class CookerParser(object):
     def __init__(self, cooker, filelist, masked):
@@ -1049,7 +1053,7 @@ class CookerParser(object):
             raise
         except Exception as exc:
             self.shutdown(clean=False)
-            sys.exit(1)
+            bb.fatal('Error parsing %s: %s' % (exc.recipe, exc))
 
         self.current += 1
         self.virtuals += len(result)