Use global proxy setting if no repo proxy is set (#712926)
On Tue, 2011-06-14 at 13:01 -0700, Brian C. Lane wrote:
> If there is no repo proxy set we should use the global setting.
>
> This fixes a problem for users who only have proxy access to the network
> -- previously it was trying to pull .treeinfo directly and timing out
> after 7 minutes.
Seems reasonable to me. Ack.
> ---
> pyanaconda/yuminstall.py | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py
> index 378d4a1..905e317 100644
> --- a/pyanaconda/yuminstall.py
> +++ b/pyanaconda/yuminstall.py
> @@ -868,7 +868,7 @@ class AnacondaYum(yum.YumBase):
> initialRepos = self.repos.repos.values() + extraRepos
> for repo in filter(lambda r: r.isEnabled(), initialRepos):
> addons = self._getAddons(repo.mirrorlist or repo.baseurl[0],
> - repo.proxy_url,
> + repo.proxy_url or self.proxy_url,
> repo.sslverify)
> for addon in addons:
> addonRepo = AnacondaYumRepo(addon[0])
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
|
