| 1 |
vapier 14/12/31 01:55:27 |
| 2 |
|
| 3 |
Added: gsutil-4.7-drop-http_proxy-clearing.patch |
| 4 |
gsutil-4.7-use-friendy-version-checks.patch |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
|
| 8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/gsutil/files/gsutil-4.7-drop-http_proxy-clearing.patch |
| 12 |
|
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: gsutil-4.7-drop-http_proxy-clearing.patch |
| 17 |
=================================================================== |
| 18 |
http://crbug.com/318478 |
| 19 |
https://github.com/GoogleCloudPlatform/gsutil/pull/171 |
| 20 |
|
| 21 |
From 0067df5b08ebab29b88bbb7e6c1cd79dc4d96100 Mon Sep 17 00:00:00 2001 |
| 22 |
From: Mike Frysinger <vapier@g.o> |
| 23 |
Date: Wed, 27 Nov 2013 14:57:05 -0500 |
| 24 |
Subject: [PATCH] drop http_proxy clearing |
| 25 |
|
| 26 |
The boto logic takes care of merging the env vars and the settings in its |
| 27 |
boto config file, so there shouldn't be a need to clear things. |
| 28 |
--- |
| 29 |
gslib/__main__.py | 8 -------- |
| 30 |
1 file changed, 8 deletions(-) |
| 31 |
|
| 32 |
diff --git a/gslib/__main__.py b/gslib/__main__.py |
| 33 |
index 82a69c1..a18db42 100644 |
| 34 |
--- a/gslib/__main__.py |
| 35 |
+++ b/gslib/__main__.py |
| 36 |
@@ -247,14 +247,6 @@ def main(): |
| 37 |
else: |
| 38 |
command_name = args[0] |
| 39 |
|
| 40 |
- # Unset http_proxy environment variable if it's set, because it confuses |
| 41 |
- # boto. (Proxies should instead be configured via the boto config file.) |
| 42 |
- if 'http_proxy' in os.environ: |
| 43 |
- if debug > 1: |
| 44 |
- sys.stderr.write( |
| 45 |
- 'Unsetting http_proxy environment variable within gsutil run.\n') |
| 46 |
- del os.environ['http_proxy'] |
| 47 |
- |
| 48 |
if os.environ.get('_ARGCOMPLETE', '0') == '1': |
| 49 |
return _PerformTabCompletion(command_runner) |
| 50 |
|
| 51 |
-- |
| 52 |
1.8.4.3 |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.1 net-misc/gsutil/files/gsutil-4.7-use-friendy-version-checks.patch |
| 58 |
|
| 59 |
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 |
| 60 |
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 |
| 61 |
|
| 62 |
Index: gsutil-4.7-use-friendy-version-checks.patch |
| 63 |
=================================================================== |
| 64 |
--- a/setup.py |
| 65 |
+++ b/setup.py |
| 66 |
@@ -35,7 +35,7 @@ management tasks, including: |
| 67 |
""" |
| 68 |
|
| 69 |
requires = [ |
| 70 |
- 'boto==2.30.0', |
| 71 |
+ 'boto>=2.30.0', |
| 72 |
'crcmod>=1.7', |
| 73 |
'gcs-oauth2-boto-plugin>=1.8', |
| 74 |
'httplib2>=0.8', |
| 75 |
@@ -44,9 +44,7 @@ requires = [ |
| 76 |
'python-gflags>=2.0', |
| 77 |
'retry_decorator>=1.0.0', |
| 78 |
'six>=1.8.0', |
| 79 |
- # Not using 1.02 because of: |
| 80 |
- # https://code.google.com/p/socksipy-branch/issues/detail?id=3 |
| 81 |
- 'SocksiPy-branch==1.01', |
| 82 |
+ 'SocksiPy-branch>=1.01', |
| 83 |
] |
| 84 |
|
| 85 |
dependency_links = [ |
Archives