From 95b86ef779ca0f621569ea56926c84877233a6ee Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 15 Jun 2020 14:44:12 +0100 Subject: install-buildtools: fail if an error occurs Several failure paths were displaying an error message but not returning, so the install process continued and failed further. (From OE-Core rev: deed12d01fa656ee0cf81a6b7b9ed74278e48c50) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit b00e28735b64a781707441ec6187dd7f9240d97a) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- scripts/install-buildtools | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/install-buildtools b/scripts/install-buildtools index c6b3a1eed7..d722519f0f 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools @@ -258,6 +258,7 @@ def main(): else: logger.error("Checksum %s expected. Actual checksum is %s." % (checksum, checksum_value)) + return 1 # Make installer executable logger.info("Making installer executable") @@ -273,6 +274,7 @@ def main(): ret = subprocess.call("%s -y" % tmpbuildtools, shell=True) if ret != 0: logger.error("Could not run buildtools installer") + return ret # Setup the environment logger.info("Setting up the environment") -- cgit v1.2.3-54-g00ecf