backend/satellite_tools/repo_plugins/yum_src.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 818f91d4ef5a3db186d1c44fffd675ff4db3524a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 21 16:17:42 2012 +0100
877451 - honor yum's "proxy = _none_" settings
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py
b/backend/satellite_tools/repo_plugins/yum_src.py
index a7d82c4..56ed458 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -130,7 +130,8 @@ class ContentSource(object):
fileutils.makedirs(pkgdir, user='apache', group='apache')
repo.pkgdir = pkgdir
- if not repo.proxy and self.proxy_addr is not None:
+ if not (repo.cfg.has_option(self.name, 'proxy') or
repo.cfg.has_option('main', 'proxy')) \
+ self.proxy_addr is not None:
repo.proxy = "http://%s" % self.proxy_addr
repo.proxy_username = self.proxy_user
repo.proxy_password = self.proxy_pass
Show replies by date