Merge pull request #5818 from jkonecny12/master-fix-27938

Use proxy server also for FTP .treeinfo download
rhinstaller · Aug 14, 2024 · a2b9053 · a2b9053
2 parents 96e4846 + a203b75
commit a2b9053
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pyanaconda/modules/payloads/payload/dnf/tree_info.py b/pyanaconda/modules/payloads/payload/dnf/tree_info.py
@@ -274,7 +274,8 @@ def _get_downloader(self, session, data):
  proxy = ProxyString(proxy_url)
  proxies = {
  "http": proxy.url,
- "https": proxy.url
+ "https": proxy.url,
+ "ftp": proxy.url
  }
  except ProxyStringError as e:
  log.debug("Failed to parse the proxy '%s': %s", proxy_url, e)

diff --git a/tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_dnf_tree_info.py b/tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_dnf_tree_info.py
@@ -419,7 +419,8 @@ def test_load_data_proxy(self, session_getter):
  headers={"user-agent": "anaconda (anaconda)/bluesky"},
  proxies={
  'http': 'http://user:pass@example.com:3128',
- 'https': 'http://user:pass@example.com:3128'
+ 'https': 'http://user:pass@example.com:3128',
+ 'ftp': 'http://user:pass@example.com:3128'
  },
  verify=True,
  cert=None,