-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
9 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
NAME = yum-plugin-s3-iam | ||
VERSION = 1.2.1 | ||
VERSION = 1.2.2 | ||
RELEASE = 1 | ||
ARCH = noarch | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,7 +34,7 @@ | |
__email__ = "[email protected]" | ||
__copyright__ = "Copyright 2012, Julius Seporaitis" | ||
__license__ = "Apache 2.0" | ||
__version__ = "1.2.1" | ||
__version__ = "1.2.2" | ||
|
||
|
||
__all__ = ['requires_api_version', 'plugin_type', 'CONDUIT', | ||
|
@@ -167,7 +167,7 @@ def __init__(self, repoid, repo): | |
proxy_config['https'] = os.environ['https_proxy'] | ||
if 'http_proxy' in os.environ: | ||
proxy_config['http'] = os.environ['http_proxy'] | ||
if repo.proxy: | ||
if repo.proxy and repo.proxy != '__none__': | ||
proxy_config['https'] = proxy_config['http'] = repo.proxy | ||
if proxy_config: | ||
proxy = urllib2.ProxyHandler(proxy_config) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,6 +37,9 @@ rm -rf ${RPM_BUILD_ROOT} | |
/usr/lib/yum-plugins/s3iam.py* | ||
|
||
%changelog | ||
* Fri May 05 2017 Mathias Brossard <[email protected]> 1.2.2-1 | ||
- Handle special value '__none__' for proxy (@andlam) | ||
|
||
* Fri May 05 2017 Mathias Brossard <[email protected]> 1.2.1-1 | ||
- Add support for proxy (@AgarFu) | ||
|
||
|