neil / rpms / anaconda

Forked from rpms/anaconda a year ago
Clone
Brian Stinson 6e9189
diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.py anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.py
Brian Stinson 6e9189
--- anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.py	2020-02-20 11:12:01.000000000 -0600
Brian Stinson 981118
+++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.py	2020-05-11 21:16:25.570796770 -0500
Brian Stinson 6e9189
@@ -655,9 +655,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
Brian Stinson 6e9189
         - method is None
Brian Stinson 6e9189
         - the RedHatCDNEnabled hint needs to be True
Brian Stinson 6e9189
         """
Brian Stinson 6e9189
-        method_set = self.data.method.method is not None
Brian Stinson 6e9189
-        cdn_enabled = self._payload_module.proxy.RedHatCDNEnabled
Brian Stinson 6e9189
-        return cdn_enabled and not method_set
Brian Stinson 6e9189
+        return False
Brian Stinson 6e9189
 
Brian Stinson 6e9189
     @property
Brian Stinson 6e9189
     def completed(self):
Brian Stinson 981118
@@ -813,6 +811,8 @@ class SourceSpoke(NormalSpoke, GUISpokeI
Brian Stinson 981118
         self._networkButton.connect("toggled", self.on_source_toggled, self._networkBox)
Brian Stinson 981118
         self._networkButton.connect("toggled", self._updateURLEntryCheck)
Brian Stinson 981118
 
Brian Stinson 981118
+        really_hide(self._cdnButton)
Brian Stinson 981118
+
Brian Stinson 981118
         # Show or hide the updates option based on the installclass
Brian Stinson 981118
         if self.instclass.installUpdates:
Brian Stinson 981118
             really_show(self._updatesBox)
Brian Stinson 981118
@@ -831,7 +831,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
Brian Stinson 6e9189
         payloadMgr.addListener(payloadMgr.STATE_ERROR, self._payload_error)
Brian Stinson 6e9189
 
Brian Stinson 6e9189
         # default to Red Hat CDN if no method has been specified
Brian Stinson 6e9189
-        if not self.data.method.method:
Brian Stinson 6e9189
+        if False:
Brian Stinson 6e9189
             log.debug("source spoke: no method set during initialization, enabling CDN")
Brian Stinson 6e9189
             self._cdnButton.set_active(True)
Brian Stinson 6e9189
             # Clear the manual flag that unfortunately also gets triggered
Brian Stinson 981118
@@ -1009,7 +1009,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
Brian Stinson 6e9189
 
Brian Stinson 6e9189
         # Set CDN radio button active, in case external conditions
Brian Stinson 6e9189
         # changed since the last refresh.
Brian Stinson 6e9189
-        if self.cdn_used_as_installation_source and not self._cdnButton.get_active():
Brian Stinson 6e9189
+        if False:
Brian Stinson 6e9189
             log.debug("source spoke: CDN enabled, enabling CDN button")
Brian Stinson 6e9189
             self._cdnButton.set_active(True)
Brian Stinson 6e9189
         elif self.data.method.method == "url":
Brian Stinson 981118
@@ -1059,9 +1059,9 @@ class SourceSpoke(NormalSpoke, GUISpokeI
Brian Stinson 6e9189
             # guess.  Try to autodetect media if that was provided, and then
Brian Stinson 6e9189
             # fall back to Red Hat CDN.
Brian Stinson 6e9189
             autodetect_on = not self._autodetectButton.get_no_show_all()
Brian Stinson 6e9189
-            cdn_in_use = self.cdn_used_as_installation_source
Brian Stinson 6e9189
+            cdn_in_use = False
Brian Stinson 6e9189
             if autodetect_on and not cdn_in_use:
Brian Stinson 981118
-                self._autodetectButton.set_active(True)
Brian Stinson 981118
+                self._autodetectButton.set_active(False)
Brian Stinson 6e9189
                 self.data.method.method = "cdrom"
Brian Stinson 6e9189
                 log.debug("source spoke: CDN not enabled & no other method found, enabling cdrom")
Brian Stinson 981118
             elif not self._cdnButton.get_active():
Brian Stinson 981118
@@ -1069,7 +1069,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
Brian Stinson 6e9189
                 # NOTE: we already do something similar at the start of the method, but we need
Brian Stinson 6e9189
                 #       to do it again as some of the calls in between might have side effects
Brian Stinson 6e9189
                 #       that could result in CDN and/or the button being turned on/off
Brian Stinson 6e9189
-                self._cdnButton.set_active(True)
Brian Stinson 981118
+                self._cdnButton.set_active(False)
Brian Stinson 6e9189
                 self.data.method.method = None
Brian Stinson 981118
                 self._update_CDN_usage()
Brian Stinson 6e9189