Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

yum: handle "_none_" value for proxy #56725

Merged
merged 2 commits into from May 23, 2019
Merged

yum: handle "_none_" value for proxy #56725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4fcc7e
yum: handle "_none_" value for proxy
mkrizek May 21, 2019
2df6557
Fix sanity check
mkrizek May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/56538-yum-handle-proxy-conf.yaml
View file
Open in desktop
@@ -0,0 +1,2 @@
bugfixes:
- 'yum - handle special "_none_" value for proxy in yum.conf and .repo files (https://github.com/ansible/ansible/issues/56538)'
3 changes: 2 additions & 1 deletion lib/ansible/modules/packaging/os/yum.py
View file
Open in desktop
Expand Up @@ -728,7 +728,8 @@ def set_env_proxy(self):
scheme = ["http", "https"]
old_proxy_env = [os.getenv("http_proxy"), os.getenv("https_proxy")]
try:
if my.conf.proxy:
# "_none_" is a special value to disable proxy in yum.conf/*.repo
if my.conf.proxy and my.conf.proxy not in ("_none_",):
if my.conf.proxy_username:
namepass = namepass + my.conf.proxy_username
proxy_url = my.conf.proxy
Expand Down