diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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, 35 insertions, 0 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 new file mode 100644 index 000000000000..4c36035d21c5 --- /dev/null +++ b/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch @@ -0,0 +1,35 @@ +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 + |