summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/cookerdata.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 3555585c84..25eea827da 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -160,12 +160,7 @@ def catch_parse_error(func):
160 def wrapped(fn, *args): 160 def wrapped(fn, *args):
161 try: 161 try:
162 return func(fn, *args) 162 return func(fn, *args)
163 except IOError as exc: 163 except Exception as exc:
164 import traceback
165 parselog.critical(traceback.format_exc())
166 parselog.critical("Unable to parse %s: %s" % (fn, exc))
167 raise bb.BBHandledException()
168 except bb.data_smart.ExpansionError as exc:
169 import traceback 164 import traceback
170 165
171 bbdir = os.path.dirname(__file__) + os.sep 166 bbdir = os.path.dirname(__file__) + os.sep
@@ -177,9 +172,6 @@ def catch_parse_error(func):
177 break 172 break
178 parselog.critical("Unable to parse %s" % fn, exc_info=(exc_class, exc, tb)) 173 parselog.critical("Unable to parse %s" % fn, exc_info=(exc_class, exc, tb))
179 raise bb.BBHandledException() 174 raise bb.BBHandledException()
180 except bb.parse.ParseError as exc:
181 parselog.critical(str(exc))
182 raise bb.BBHandledException()
183 return wrapped 175 return wrapped
184 176
185@catch_parse_error 177@catch_parse_error