[master 1/1] Use proxy when configured for the base repo (#1196953)
spartacus06
installerbot-noreply at redhat.com
Mon Mar 23 14:53:09 UTC 2015
From: Seth Jennings <sjenning at redhat.com>
Signed-off-by: Seth Jennings <sjenning at redhat.com>
---
pyanaconda/packaging/dnfpayload.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py
index a2532e0..5870fac 100644
--- a/pyanaconda/packaging/dnfpayload.py
+++ b/pyanaconda/packaging/dnfpayload.py
@@ -227,6 +227,12 @@ def _add_repo(self, ksrepo):
if mirrorlist:
repo.mirrorlist = mirrorlist
repo.sslverify = not (ksrepo.noverifyssl or flags.noverifyssl)
+ if ksrepo.proxy:
+ try:
+ repo.proxy = ProxyString(ksrepo.proxy).url
+ except ProxyStringError as e:
+ log.error("Failed to parse proxy for _add_repo %s: %s",
+ ksrepo.proxy, e)
# If this repo is already known, it's one of two things:
# (1) The user is trying to do "repo --name=updates" in a kickstart file
@@ -702,9 +708,10 @@ def updateBaseRepo(self, fallback=True, checkmount=True):
method.method, e)
try:
+ proxy = getattr(method, "proxy", None)
base_ksrepo = self.data.RepoData(
name=constants.BASE_REPO_NAME, baseurl=url,
- mirrorlist=mirrorlist, noverifyssl=not sslverify)
+ mirrorlist=mirrorlist, noverifyssl=not sslverify, proxy=proxy)
self._add_repo(base_ksrepo)
except (packaging.MetadataError, packaging.PayloadError) as e:
log.error("base repo (%s/%s) not valid -- removing it",
--
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/f0c2a6452697e951610bae4307d0d564773ce548
More information about the anaconda-patches
mailing list