From 47e2dbd89a92faca3e188d509c5629c59feca770 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 28 Apr 2015 14:27:34 +0300 Subject: bitbake: bitbake: Handle BBMainException Some error messages were lost because BBMainException was inherited from bb.BBHandledException. When bb.BBHandledException is processed error messages are not printed as they suppose to be printed before raising this exception. Stopped to inherit BBMainException from bb.BBHandledException. Handled BBMainException in bin/bitbake and printed error message to the stderr. (Bitbake rev: c8e2a40c4e9865ebef9936d23644f2602a5c90f5) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 5 ++++- bitbake/lib/bb/main.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index af915075dc..3e1ca6286c 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -33,12 +33,15 @@ except RuntimeError as exc: sys.exit(str(exc)) from bb import cookerdata -from bb.main import bitbake_main, BitBakeConfigParameters +from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException if __name__ == "__main__": try: ret = bitbake_main(BitBakeConfigParameters(sys.argv), cookerdata.CookerConfiguration()) + except BBMainException as err: + print >>sys.stderr, err + ret = 1 except bb.BBHandledException: ret = 1 except Exception: diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index af067f7379..2019d5014b 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py @@ -39,7 +39,7 @@ from bb import cookerdata __version__ = "1.27.0" logger = logging.getLogger("BitBake") -class BBMainException(bb.BBHandledException): +class BBMainException(Exception): pass def get_ui(config): -- cgit v1.2.3-54-g00ecf