a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

yum: handle "_none_" value for proxy (#56725) 

* yum: handle "_none_" value for proxy

Fixes #56538

* Fix sanity check
pull/4420/head
Martin Krizek 2019-05-23 16:41:18 +02:00 committed by ansibot
parent 8f4f3750fe
commit 7b9d7e6b5c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/56538-yum-handle-proxy-conf.yaml Normal file
View File

@ -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
lib/ansible/modules/packaging/os/yum.py
View File

@ -728,7 +728,8 @@ class YumModule(YumDnf):
scheme = ["http", "https"] scheme = ["http", "https"]
old_proxy_env = [os.getenv("http_proxy"), os.getenv("https_proxy")] old_proxy_env = [os.getenv("http_proxy"), os.getenv("https_proxy")]
try: 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: if my.conf.proxy_username:
namepass = namepass + my.conf.proxy_username namepass = namepass + my.conf.proxy_username
proxy_url = my.conf.proxy proxy_url = my.conf.proxy