Support optional BOTO specification with --no_auth.

download_from_google_storage.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Download files from Google Storage based on SHA1 sums."""
 
 
 import hashlib
 import optparse
@@ skipping 366 matching lines @@
     if options.auto_platform:
       parser.error('--platform can not be specified with --auto_platform')
     if not re.match(options.platform, GetNormalizedPlatform()):
       if options.verbose:
         print('The current platform doesn\'t match "%s", skipping.' %
               options.platform)
       return 0
 
   # Set the boto file to /dev/null if we don't need auth.
   if options.no_auth:
-    options.boto = os.devnull
+    if (os.environ.get('BOTO_CONFIG') and not
+        os.environ.get('NO_AUTH_BOTO_CONFIG')):

[hinoka, 2015/01/14 18:50:15]

Lets only trigger this if proxy settings are detected.  Otherwise this message
will show up literally everywhere.

[Michael Moss, 2015/01/14 20:04:05]

Everyone exports BOTO_CONFIG? The case I'm concerned about it somebody exporting
BOTO_CONFIG, expecting proxying to work, and wonder why it's not. This should
make it pretty clear what's going on.

+      print >> sys.stderr, ('NOTICE: You have BOTO_CONFIG set in your '
+                            'environment, but the "--no_auth" flag prevents '
+                            'it from being used.\n'

[hinoka, 2015/01/14 18:50:15]

Split this into two print statements. '\n' isn't technically windows friendly.

[Michael Moss, 2015/01/14 21:05:44]

Done.

+                            'If you need boto configs even when using '
+                            '--no_auth (e.g. proxy settings), export your '
+                            'BOTO_CONFIG as NO_AUTH_BOTO_CONFIG instead.')

[hinoka, 2015/01/14 18:50:15]

s/instead/also/

[Michael Moss, 2015/01/14 21:05:44]

Done.

+    options.boto = os.environ.get('NO_AUTH_BOTO_CONFIG', os.devnull)
 
   # Make sure gsutil exists where we expect it to.
   if os.path.exists(GSUTIL_DEFAULT_PATH):
     gsutil = Gsutil(GSUTIL_DEFAULT_PATH,
                     boto_path=options.boto)
   else:
     parser.error('gsutil not found in %s, bad depot_tools checkout?' %
                  GSUTIL_DEFAULT_PATH)
 
   # Passing in -g/--config will run our copy of GSUtil, then quit.
@@ skipping 52 matching lines @@
       return code
 
   return download_from_google_storage(
       input_filename, base_url, gsutil, options.num_threads, options.directory,
       options.recursive, options.force, options.output, options.ignore_errors,
       options.sha1_file, options.verbose, options.auto_platform)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))