[PATCH 4/4] Set repo.proxy only after fully assembled (#602712)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



When repo.proxy is set yum immediately parses it, so it can only be
set once it has been fully assembled with protocol, host and port.

Related: rhbz#602712
---
 yuminstall.py |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/yuminstall.py b/yuminstall.py
index 0bd1608..dbf8a1f 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -766,16 +766,20 @@ class AnacondaYum(YumSorter):
                         # together using the colon at the beginning of the port
                         # match as a separator.  Otherwise, just use the host.
                         if m.group(6):
-                            repo.proxy = m.group(5) + m.group(6)
+                            proxy = m.group(5) + m.group(6)
                         else:
-                            repo.proxy = m.group(5)
+                            proxy = m.group(5)
 
                         # yum also requires a protocol.  If none was given,
                         # default to http.
                         if m.group(1):
-                            repo.proxy = m.group(1) + repo.proxy
+                            proxy = m.group(1) + proxy
                         else:
-                            repo.proxy = "http://"; + repo.proxy
+                            proxy = "http://"; + proxy
+
+                        # Set the repo proxy. NOTE: yum immediately parses this and
+                        # raises an error if it isn't correct
+                        repo.proxy = proxy
 
                     if m and m.group(3):
                         repo.proxy_username = m.group(3)
-- 
1.7.0.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux