vapier 14/12/31 01:55:27
Added: gsutil-4.7-drop-http_proxy-clearing.patch
gsutil-4.7-use-friendy-version-checks.patch
Log:
Version bump.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.1
net-misc/gsutil/files/gsutil-4.7-drop-http_proxy-clearing.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsutil/files/gsutil-4.7-drop-http_proxy-clearing.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsutil/files/gsutil-4.7-drop-http_proxy-clearing.patch?rev=1.1&content-type=text/plain
Index: gsutil-4.7-drop-http_proxy-clearing.patch
===================================================================
http://crbug.com/318478
https://github.com/GoogleCloudPlatform/gsutil/pull/171
>From 0067df5b08ebab29b88bbb7e6c1cd79dc4d96100 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email protected]>
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']
-
if os.environ.get('_ARGCOMPLETE', '0') == '1':
return _PerformTabCompletion(command_runner)
--
1.8.4.3
1.1
net-misc/gsutil/files/gsutil-4.7-use-friendy-version-checks.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsutil/files/gsutil-4.7-use-friendy-version-checks.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsutil/files/gsutil-4.7-use-friendy-version-checks.patch?rev=1.1&content-type=text/plain
Index: gsutil-4.7-use-friendy-version-checks.patch
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ management tasks, including:
"""
requires = [
- 'boto==2.30.0',
+ 'boto>=2.30.0',
'crcmod>=1.7',
'gcs-oauth2-boto-plugin>=1.8',
'httplib2>=0.8',
@@ -44,9 +44,7 @@ requires = [
'python-gflags>=2.0',
'retry_decorator>=1.0.0',
'six>=1.8.0',
- # Not using 1.02 because of:
- # https://code.google.com/p/socksipy-branch/issues/detail?id=3
- 'SocksiPy-branch==1.01',
+ 'SocksiPy-branch>=1.01',
]
dependency_links = [
