summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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):