summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-04-28 14:27:34 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-29 10:59:53 +0100
commit47e2dbd89a92faca3e188d509c5629c59feca770 (patch)
tree5054f39a643c096cdf5e6d4381d922bb11318247
parent74dc93651f9a04c1cf0160c05357f0a36aa9c5d4 (diff)
downloadpoky-47e2dbd89a92faca3e188d509c5629c59feca770.tar.gz
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 <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake5
-rwxr-xr-xbitbake/lib/bb/main.py2
2 files changed, 5 insertions, 2 deletions
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:
33 sys.exit(str(exc)) 33 sys.exit(str(exc))
34 34
35from bb import cookerdata 35from bb import cookerdata
36from bb.main import bitbake_main, BitBakeConfigParameters 36from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException
37 37
38if __name__ == "__main__": 38if __name__ == "__main__":
39 try: 39 try:
40 ret = bitbake_main(BitBakeConfigParameters(sys.argv), 40 ret = bitbake_main(BitBakeConfigParameters(sys.argv),
41 cookerdata.CookerConfiguration()) 41 cookerdata.CookerConfiguration())
42 except BBMainException as err:
43 print >>sys.stderr, err
44 ret = 1
42 except bb.BBHandledException: 45 except bb.BBHandledException:
43 ret = 1 46 ret = 1
44 except Exception: 47 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
39__version__ = "1.27.0" 39__version__ = "1.27.0"
40logger = logging.getLogger("BitBake") 40logger = logging.getLogger("BitBake")
41 41
42class BBMainException(bb.BBHandledException): 42class BBMainException(Exception):
43 pass 43 pass
44 44
45def get_ui(config): 45def get_ui(config):