diff options
Diffstat (limited to 'net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch')
-rw-r--r-- | net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch b/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch deleted file mode 100644 index 4c36035d21c5..000000000000 --- a/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://crbug.com/318478 - -From 0067df5b08ebab29b88bbb7e6c1cd79dc4d96100 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Wed, 27 Nov 2013 14:57:05 -0500 -Subject: [PATCH] drop http_proxy clearing - -The boto logic takes care of merging the env vars and the settings in its -boto config file, so there shouldn't be a need to clear things. ---- - gslib/__main__.py | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/gslib/__main__.py b/gslib/__main__.py -index 82a69c1..a18db42 100644 ---- a/gslib/__main__.py -+++ b/gslib/__main__.py -@@ -247,14 +247,6 @@ def main(): - else: - command_name = args[0] - -- # Unset http_proxy environment variable if it's set, because it confuses -- # boto. (Proxies should instead be configured via the boto config file.) -- if 'http_proxy' in os.environ: -- if debug > 1: -- sys.stderr.write( -- 'Unsetting http_proxy environment variable within gsutil run.\n') -- del os.environ['http_proxy'] -- - return _RunNamedCommandAndHandleExceptions( - command_runner, command_name, args[1:], headers, debug, - parallel_operations) --- -1.8.4.3 - |