diff options
Diffstat (limited to 'scripts/storage.py')
-rwxr-xr-x | scripts/storage.py | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/scripts/storage.py b/scripts/storage.py index 89e5f6107..3db76bf76 100755 --- a/scripts/storage.py +++ b/scripts/storage.py @@ -26,30 +26,30 @@ STORAGE_BASE = 'https://storage.googleapis.com/wasm-llvm/builds/git/' def download_revision(force_latest): - name = 'latest' if force_latest else 'lkgr' - downloaded = urllib2.urlopen(STORAGE_BASE + name).read().strip() - # TODO: for now try opening as JSON, if that doesn't work then the content is - # just a hash. The waterfall is in the process of migrating to JSON. - info = None - try: - info = json.loads(downloaded) - except ValueError: - pass - return info['build'] if type(info) == dict else downloaded + name = 'latest' if force_latest else 'lkgr' + downloaded = urllib2.urlopen(STORAGE_BASE + name).read().strip() + # TODO: for now try opening as JSON, if that doesn't work then the content is + # just a hash. The waterfall is in the process of migrating to JSON. + info = None + try: + info = json.loads(downloaded) + except ValueError: + pass + return info['build'] if type(info) == dict else downloaded def download_tar(tar_pattern, directory, revision): - tar_path = os.path.join(directory, tar_pattern) - revision_tar_path = tar_path % revision - if os.path.isfile(revision_tar_path): - print('Already have `%s`' % revision_tar_path) - else: - print('Downloading `%s`' % revision_tar_path) - with open(revision_tar_path, 'w+') as f: - f.write(urllib2.urlopen(STORAGE_BASE + tar_pattern % revision).read()) - # Remove any previous tarfiles. - for older_tar in glob.glob(tar_path % '*'): - if older_tar != revision_tar_path: - print('Removing older tar file `%s`' % older_tar) - os.remove(older_tar) - return revision_tar_path + tar_path = os.path.join(directory, tar_pattern) + revision_tar_path = tar_path % revision + if os.path.isfile(revision_tar_path): + print('Already have `%s`' % revision_tar_path) + else: + print('Downloading `%s`' % revision_tar_path) + with open(revision_tar_path, 'w+') as f: + f.write(urllib2.urlopen(STORAGE_BASE + tar_pattern % revision).read()) + # Remove any previous tarfiles. + for older_tar in glob.glob(tar_path % '*'): + if older_tar != revision_tar_path: + print('Removing older tar file `%s`' % older_tar) + os.remove(older_tar) + return revision_tar_path |