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