From da73a4bdaa8999a002b5e092078442807470a37b Mon Sep 17 00:00:00 2001 From: "hinoka@google.com" Date: Sat, 25 Jan 2014 01:09:52 +0000 Subject: [PATCH] bypass_prodaccess fix It looked like the bypass_prodaccess flag wasn't passed in all the way to where it needed to be, causing it to be set to True by default at some point, which caused the prodaccess path to never happen. This change takes the flag and brings it all of the way. BUG=337972 Review URL: https://codereview.chromium.org/147443002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@247049 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/gsutil/gslib/command_runner.py | 5 +++-- third_party/gsutil/gsutil | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 third_party/gsutil/gslib/command_runner.py diff --git a/third_party/gsutil/gslib/command_runner.py b/third_party/gsutil/gslib/command_runner.py old mode 100644 new mode 100755 index d1b3fbd34..829479d48 --- a/third_party/gsutil/gslib/command_runner.py +++ b/third_party/gsutil/gslib/command_runner.py @@ -64,7 +64,8 @@ class CommandRunner(object): return command_map def RunNamedCommand(self, command_name, args=None, headers=None, debug=0, - parallel_operations=False, test_method=None): + parallel_operations=False, test_method=None, + bypass_prodaccess=True): """Runs the named command. Used by gsutil main, commands built atop other commands, and tests . @@ -97,5 +98,5 @@ class CommandRunner(object): parallel_operations, self.gsutil_bin_dir, self.boto_lib_dir, self.config_file_list, self.gsutil_ver, self.bucket_storage_uri_class, - test_method) + test_method, bypass_prodaccess) return command_inst.RunCommand() diff --git a/third_party/gsutil/gsutil b/third_party/gsutil/gsutil index e6509edca..49c83d01d 100755 --- a/third_party/gsutil/gsutil +++ b/third_party/gsutil/gsutil @@ -262,7 +262,8 @@ def _RunNamedCommandAndHandleExceptions(command_runner, command_name, args=None, if not util.IS_WINDOWS: signal.signal(signal.SIGQUIT, _HandleSigQuit) return command_runner.RunNamedCommand(command_name, args, headers, debug, - parallel_operations) + parallel_operations, + bypass_prodaccess=bypass_prodaccess) except AttributeError, e: if str(e).find('secret_access_key') != -1: _OutputAndExit('Missing credentials for the given URI(s). Does your '