download_sdk_extras: Catch the correct error.

build/download_sdk_extras.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script to download sdk/extras packages on the bots from google storage.
 
 The script expects arguments that specify zips file in the google storage
 bucket named: <dir in SDK extras>_<package name>_<version>.zip. The file will
 be extracted in the android_tools/sdk/extras directory on the test bots. This
@@ skipping 41 matching lines @@
   # Update the android_sdk_extras.json file to update downloaded packages.
   with open(SDK_EXTRAS_JSON_FILE) as json_file:
     packages = json.load(json_file)
   for package in packages:
     local_zip = '%s/%s' % (SDK_EXTRAS_PATH, package['zip'])
     if not os.path.exists(local_zip):
       package_zip = '%s/%s' % (SDK_EXTRAS_BUCKET, package['zip'])
       try:
         subprocess.check_call(['python', GSUTIL_PATH, '--force-version', '4.7',
                                'cp', package_zip, local_zip])
-      except AccessDeniedException:
-        print ('WARNING: Bot does not have permission to download SDK packages.'
-               ' If this bot compiles for Android, it may have errors.')
+      except subprocess.CalledProcessError:
+        print ('WARNING: Failed to download SDK packages. If this bot compiles '

[navabi, 2015/02/23 17:40:49]

We still need to catch the AccessDeniedExceptions for cases where the call works
but the bot does not have gstuil credentials.

[dnj, 2015/02/23 17:43:17]

We can't catch AccessDeniedException. gsutil, which emits the exception, is
executing in a subprocess, so the only feedback that this script gets is the
subprocess return code, not the actual exception.

This construction catches that and prints the warning. It (something) looks
like:

AccessDeniedException: 403 << output from gsutil, causing it to return non-zero.
WARNING: Failed to download SDK packages... << output from this 'print'.

[scottmg, 2015/02/23 18:19:44]

Is is useful to print the content of the exception here? (e.g. for the command
line)

+               'for Android, it may have errors.')
         return 0
     # Always clean dir and extract zip to ensure correct contents.
     clean_and_extract(package['dir_name'], package['package'], package['zip'])
 
 
 if __name__ == '__main__':
   sys.exit(main())