diff options
author | Ross Burton <ross.burton@arm.com> | 2020-06-15 14:44:12 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2020-06-18 06:23:00 -1000 |
commit | deed12d01fa656ee0cf81a6b7b9ed74278e48c50 (patch) | |
tree | 300f04ab3a907bd2f423b944401017a0e28e46d1 /scripts/install-buildtools | |
parent | ceffd920c7bdae29cd1a606f1c20d1b2d3666f5b (diff) | |
download | openembedded-core-contrib-deed12d01fa656ee0cf81a6b7b9ed74278e48c50.tar.gz |
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>
Diffstat (limited to 'scripts/install-buildtools')
-rwxr-xr-x | scripts/install-buildtools | 2 |
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") |