summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-12-15 22:07:38 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:51 +0000
commit2984877989ec181409871dfde6723f7f9de466e1 (patch)
tree009ca8f20a02e989dbe878ac3530908f830f6a02 /bitbake/lib/bb
parent2f0c23d28d0f7a4b33f24aff7e799b13cb437a67 (diff)
downloadopenembedded-core-2984877989ec181409871dfde6723f7f9de466e1.tar.gz
openembedded-core-2984877989ec181409871dfde6723f7f9de466e1.tar.bz2
openembedded-core-2984877989ec181409871dfde6723f7f9de466e1.tar.xz
openembedded-core-2984877989ec181409871dfde6723f7f9de466e1.zip
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>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cooker.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8ac88b99a..7a9b1d58d 100644
--- 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)