firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make download_android_tools fail when the download fails (#8261)

Browse Source
This commit is contained in:
Michael Goderbauer 2017-02-17 16:00:12 -08:00 committed by GitHub
parent e0b12ca17e
commit 4e531f64c6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dev/bots/download_android_tools.py
View File

@ -62,7 +62,7 @@ def UpdateTools(tools_name):
version = f.read().strip() version = f.read().strip()
# Return if installed binaries are up to date. # Return if installed binaries are up to date.
if version == GetInstalledVersion(version_stamp): if version == GetInstalledVersion(version_stamp):
return return True
# Remove the old install directory checked out from git. # Remove the old install directory checked out from git.
if os.path.exists(os.path.join(INSTALL_DIR, '.git')): if os.path.exists(os.path.join(INSTALL_DIR, '.git')):
@ -82,7 +82,7 @@ def UpdateTools(tools_name):
archive_path] archive_path]
if not RunCommand(download_cmd): if not RunCommand(download_cmd):
print ('WARNING: Failed to download Android tools.') print ('WARNING: Failed to download Android tools.')
return return False
print "Extracting Android tools (" + tools_name + ")" print "Extracting Android tools (" + tools_name + ")"
with tarfile.open(archive_path) as arch: with tarfile.open(archive_path) as arch:
@ -91,6 +91,7 @@ def UpdateTools(tools_name):
# Write version as the last step. # Write version as the last step.
with open(os.path.join(INSTALL_DIR, version_stamp), 'w+') as f: with open(os.path.join(INSTALL_DIR, version_stamp), 'w+') as f:
f.write('%s\n' % version) f.write('%s\n' % version)
return True
def main(argv): def main(argv):
option_parser = optparse.OptionParser() option_parser = optparse.OptionParser()
@ -110,10 +111,13 @@ def main(argv):
option_parser.print_help() option_parser.print_help()
sys.exit(1) sys.exit(1)
if options.type in ('sdk', 'both'): if options.type in ('sdk', 'both') and not UpdateTools('sdk'):
UpdateTools('sdk') print ('ERROR: Failed to download sdk.')
if options.type in ('ndk', 'both'): sys.exit(1)
UpdateTools('ndk')
if options.type in ('ndk', 'both') and not UpdateTools('ndk'):
print ('ERROR: Failed to download ndk.')
sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))