From 4eeae70a451e25143036bc2d4118d64b2ab1d850 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 28 Apr 2015 15:52:18 +0300 Subject: [PATCH] bitbake: bitbake: use sys.exit to simplify the code Used sys.exit instead of assigning exit code to variable. This way it's more clear when bitbake exists and which exit code is used. (Bitbake rev: 5ecb8817bd49223652ede4fe513f1a42f2196798) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 88ac8c34ca..b6f19ef27e 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -41,16 +41,13 @@ if __name__ == "__main__": if __version__ != bb.__version__: sys.exit("Bitbake core version and program version mismatch!") try: - ret = bitbake_main(BitBakeConfigParameters(sys.argv), - cookerdata.CookerConfiguration()) + sys.exit(bitbake_main(BitBakeConfigParameters(sys.argv), + cookerdata.CookerConfiguration())) except BBMainException as err: - print >>sys.stderr, err - ret = 1 + sys.exit(err) except bb.BBHandledException: - ret = 1 + sys.exit(1) except Exception: - ret = 1 import traceback traceback.print_exc() - sys.exit(ret) - + sys.exit(1)