summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2020-06-15 14:44:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-16 23:39:28 +0100
commit7bf4949eaa4a48295ab6190538df807144c116e5 (patch)
treebf529e30f751c18f17f5ad271b750bf6d594b7e2 /scripts
parentf99b77eb8190cf7498b3e9e5a5032a77a1a888e8 (diff)
downloadpoky-7bf4949eaa4a48295ab6190538df807144c116e5.tar.gz
poky-7bf4949eaa4a48295ab6190538df807144c116e5.tar.bz2
poky-7bf4949eaa4a48295ab6190538df807144c116e5.zip
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: b00e28735b64a781707441ec6187dd7f9240d97a) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/install-buildtools2
1 files changed, 2 insertions, 0 deletions
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")