Report more detailed error from download_from_google_storage.py when gsutil fails.
BUG=
Review URL: https://codereview.chromium.org/1091373004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295416 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/download_from_google_storage.py b/download_from_google_storage.py
index 5c1df03..291643b 100755
--- a/download_from_google_storage.py
+++ b/download_from_google_storage.py
@@ -100,7 +100,7 @@
if ('You are attempting to access protected data with '
'no configured credentials.' in err):
return (403, out, err)
- if 'No such object' in err:
+ if 'matched no objects' in err:
return (404, out, err)
return (code, out, err)
@@ -206,11 +206,19 @@
continue
# Check if file exists.
file_url = '%s/%s' % (base_url, input_sha1_sum)
- if gsutil.check_call('ls', file_url)[0] != 0:
- out_q.put('%d> File %s for %s does not exist, skipping.' % (
- thread_num, file_url, output_filename))
- ret_codes.put((1, 'File %s for %s does not exist.' % (
- file_url, output_filename)))
+ (code, _, err) = gsutil.check_call('ls', file_url)
+ if code != 0:
+ if code == 404:
+ out_q.put('%d> File %s for %s does not exist, skipping.' % (
+ thread_num, file_url, output_filename))
+ ret_codes.put((1, 'File %s for %s does not exist.' % (
+ file_url, output_filename)))
+ else:
+ # Other error, probably auth related (bad ~/.boto, etc).
+ out_q.put('%d> Failed to fetch file %s for %s, skipping. [Err: %s]' % (
+ thread_num, file_url, output_filename, err))
+ ret_codes.put((1, 'Failed to fetch file %s for %s. [Err: %s]' % (
+ file_url, output_filename, err)))
continue
# Fetch the file.
out_q.put('%d> Downloading %s...' % (thread_num, output_filename))
