Skip to content

Commit

Permalink
Use suseLib.get_proxy to get the HTTP proxy configuration properly on…
Browse files Browse the repository at this point in the history
… DEB repos
  • Loading branch information
meaksh authored and juliogonzalez committed Apr 25, 2019
1 parent 238ac9f commit 5e5e772
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions backend/satellite_tools/repo_plugins/deb_src.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import requests
from functools import cmp_to_key
from spacewalk.common import fileutils
from spacewalk.common.suseLib import get_proxy
from spacewalk.satellite_tools.download import get_proxies
from spacewalk.satellite_tools.repo_plugins import ContentPackage, CACHE_DIR
from spacewalk.satellite_tools.syncLib import log2
Expand Down Expand Up @@ -207,9 +208,8 @@ def __init__(self, url, name, insecure=False, interactive=True, yumsrc_conf=None

# read the proxy configuration in /etc/rhn/rhn.conf
initCFG('server.satellite')
self.proxy_addr = CFG.http_proxy
self.proxy_user = CFG.http_proxy_username
self.proxy_pass = CFG.http_proxy_password

self.proxy_addr, self.proxy_user, self.proxy_pass = get_proxy(self.url)
self.authtoken = None

self.repo = DebRepo(url, os.path.join(CACHE_DIR, self.org, name),
Expand Down

0 comments on commit 5e5e772

Please sign in to comment.