From: Ross Burton <ross.burton@arm.com>
Date: Mon, 15 Jun 2020 13:44:12 +0000 (+0100)
Subject: install-buildtools: fail if an error occurs
X-Git-Tag: 2020-04.2-dunfell~101
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=deed12d01fa656ee0cf81a6b7b9ed74278e48c50;p=openembedded-core.git

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.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b00e28735b64a781707441ec6187dd7f9240d97a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

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")