diff options
| author | Ross Burton <ross.burton@arm.com> | 2020-06-15 14:44:12 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-16 23:39:28 +0100 |
| commit | 7bf4949eaa4a48295ab6190538df807144c116e5 (patch) | |
| tree | bf529e30f751c18f17f5ad271b750bf6d594b7e2 | |
| parent | f99b77eb8190cf7498b3e9e5a5032a77a1a888e8 (diff) | |
| download | poky-7bf4949eaa4a48295ab6190538df807144c116e5.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.
(From OE-Core rev: b00e28735b64a781707441ec6187dd7f9240d97a)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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(): | |||
| 258 | else: | 258 | else: |
| 259 | logger.error("Checksum %s expected. Actual checksum is %s." % | 259 | logger.error("Checksum %s expected. Actual checksum is %s." % |
| 260 | (checksum, checksum_value)) | 260 | (checksum, checksum_value)) |
| 261 | return 1 | ||
| 261 | 262 | ||
| 262 | # Make installer executable | 263 | # Make installer executable |
| 263 | logger.info("Making installer executable") | 264 | logger.info("Making installer executable") |
| @@ -273,6 +274,7 @@ def main(): | |||
| 273 | ret = subprocess.call("%s -y" % tmpbuildtools, shell=True) | 274 | ret = subprocess.call("%s -y" % tmpbuildtools, shell=True) |
| 274 | if ret != 0: | 275 | if ret != 0: |
| 275 | logger.error("Could not run buildtools installer") | 276 | logger.error("Could not run buildtools installer") |
| 277 | return ret | ||
| 276 | 278 | ||
| 277 | # Setup the environment | 279 | # Setup the environment |
| 278 | logger.info("Setting up the environment") | 280 | logger.info("Setting up the environment") |
