sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: fix parse errors not being reported 

Fixes a regression introduced in BitBake rev
c9f58ef6b897d3fa5b0d23734b5f2cb3dabb057a which prevents errors during
parsing from being fully reported because BitBake shuts down before it
can print them. Move the error printing to before the shutdown in order
to fix it.

Also remove a couple of superfluous calls to sys.exit() since these
will never be called (as self.shutdown(clean=False) does this itself).

(Bitbake rev: 356c42ed00541dea2c382c57f768a4f431d22db0)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2012-02-23 17:38:07 +00:00 committed by Richard Purdie
parent 4a1c163b55
commit ebc0d4252a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/bb/cooker.py
View File

@ -1605,22 +1605,20 @@ class CookerParser(object):
self.shutdown()
return False
except ParsingFailure as exc:
self.shutdown(clean=False)
bb.fatal('Unable to parse %s: %s' %
logger.error('Unable to parse %s: %s' %
(exc.recipe, bb.exceptions.to_string(exc.realexception)))
self.shutdown(clean=False)
except (bb.parse.ParseError, bb.data_smart.ExpansionError) as exc:
logger.error(str(exc))
self.shutdown(clean=False)
bb.fatal(str(exc))
except SyntaxError as exc:
self.shutdown(clean=False)
logger.error('Unable to parse %s', exc.recipe)
sys.exit(1)
self.shutdown(clean=False)
except Exception as exc:
etype, value, tb = sys.exc_info()
logger.error('Unable to parse %s', value.recipe,
exc_info=(etype, value, exc.traceback))
self.shutdown(clean=False)
sys.exit(1)
self.current += 1
self.virtuals += len(result)