]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
install-buildtools: fail if an error occurs
authorRoss Burton <ross.burton@arm.com>
Mon, 15 Jun 2020 13:44:12 +0000 (14:44 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 16 Jun 2020 14:20:01 +0000 (15:20 +0100)
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>
scripts/install-buildtools

index c6b3a1eed727dba45344459e95c3ea4d36a03456..d722519f0f8785ff4453d7496b26bcfed5deb16b 100755 (executable)
@@ -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")