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
--- anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.py 2020-02-20 11:12:01.000000000 -0600
+++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.py 2020-05-15 15:29:38.658567741 -0500
@@ -655,9 +655,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
- method is None
- the RedHatCDNEnabled hint needs to be True
"""
- method_set = self.data.method.method is not None
- cdn_enabled = self._payload_module.proxy.RedHatCDNEnabled
- return cdn_enabled and not method_set
+ return False
@property
def completed(self):
@@ -691,14 +689,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
elif not self.ready:
return _(BASEREPO_SETUP_MESSAGE)
elif not self.payload.baseRepo:
- subscribed = self._subscription_module.proxy.IsSubscriptionAttached
- if not self.data.method.method and not subscribed:
- # If method is None, there is no base repo and system
- # has no subscription attached it means the Red Hat CDN
- # is in use, but the system has not yet been registered.
- return _("Red Hat CDN")
- else:
- return _("Error setting up base repository")
+ return _("Error setting up base repository")
elif self._error:
return _("Error setting up software source")
elif self.data.method.method == "url":
@@ -813,6 +804,8 @@ class SourceSpoke(NormalSpoke, GUISpokeI
self._networkButton.connect("toggled", self.on_source_toggled, self._networkBox)
self._networkButton.connect("toggled", self._updateURLEntryCheck)
+ really_hide(self._cdnButton)
+
# Show or hide the updates option based on the installclass
if self.instclass.installUpdates:
really_show(self._updatesBox)
@@ -831,7 +824,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
payloadMgr.addListener(payloadMgr.STATE_ERROR, self._payload_error)
# default to Red Hat CDN if no method has been specified
- if not self.data.method.method:
+ if False:
log.debug("source spoke: no method set during initialization, enabling CDN")
self._cdnButton.set_active(True)
# Clear the manual flag that unfortunately also gets triggered
@@ -1009,7 +1002,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
# Set CDN radio button active, in case external conditions
# changed since the last refresh.
- if self.cdn_used_as_installation_source and not self._cdnButton.get_active():
+ if False:
log.debug("source spoke: CDN enabled, enabling CDN button")
self._cdnButton.set_active(True)
elif self.data.method.method == "url":
@@ -1059,9 +1052,9 @@ class SourceSpoke(NormalSpoke, GUISpokeI
# guess. Try to autodetect media if that was provided, and then
# fall back to Red Hat CDN.
autodetect_on = not self._autodetectButton.get_no_show_all()
- cdn_in_use = self.cdn_used_as_installation_source
+ cdn_in_use = False
if autodetect_on and not cdn_in_use:
- self._autodetectButton.set_active(True)
+ self._autodetectButton.set_active(False)
self.data.method.method = "cdrom"
log.debug("source spoke: CDN not enabled & no other method found, enabling cdrom")
elif not self._cdnButton.get_active():
@@ -1069,7 +1062,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
# NOTE: we already do something similar at the start of the method, but we need
# to do it again as some of the calls in between might have side effects
# that could result in CDN and/or the button being turned on/off
- self._cdnButton.set_active(True)
+ self._cdnButton.set_active(False)
self.data.method.method = None
self._update_CDN_usage()