|
Brian Stinson |
6e9189 |
diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.glade anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.glade
|
|
Brian Stinson |
6e9189 |
--- anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.glade 2019-12-13 07:20:46.000000000 -0600
|
|
Brian Stinson |
6e9189 |
+++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.glade 2020-05-01 08:41:17.708599295 -0500
|
|
Brian Stinson |
6e9189 |
@@ -637,22 +637,20 @@
|
|
Brian Stinson |
6e9189 |
</packing>
|
|
Brian Stinson |
6e9189 |
</child>
|
|
Brian Stinson |
6e9189 |
<child>
|
|
Brian Stinson |
6e9189 |
- <object class="GtkRadioButton" id="cdnRadioButton">
|
|
Brian Stinson |
6e9189 |
- <property name="label" translatable="yes" context="GUI|Software Source">Red Hat _CDN</property>
|
|
Brian Stinson |
6e9189 |
- <property name="visible">True</property>
|
|
Brian Stinson |
6e9189 |
- <property name="can_focus">True</property>
|
|
Brian Stinson |
6e9189 |
+ <object class="GtkWidget" id="cdnRadioButton">
|
|
Brian Stinson |
6e9189 |
+ <property name="sensitive">False</property>
|
|
Brian Stinson |
6e9189 |
+ <property name="visible">False</property>
|
|
Brian Stinson |
6e9189 |
+ <property name="can_focus">False</property>
|
|
Brian Stinson |
6e9189 |
<property name="receives_default">False</property>
|
|
Brian Stinson |
6e9189 |
<property name="margin_left">12</property>
|
|
Brian Stinson |
6e9189 |
<property name="use_underline">True</property>
|
|
Brian Stinson |
6e9189 |
<property name="xalign">0</property>
|
|
Brian Stinson |
6e9189 |
- <property name="active">True</property>
|
|
Brian Stinson |
6e9189 |
- <property name="draw_indicator">True</property>
|
|
Brian Stinson |
6e9189 |
- <property name="group">isoRadioButton</property>
|
|
Brian Stinson |
6e9189 |
+ <property name="active">False</property>
|
|
Brian Stinson |
6e9189 |
+ <property name="draw_indicator">False</property>
|
|
Brian Stinson |
6e9189 |
</object>
|
|
Brian Stinson |
6e9189 |
<packing>
|
|
Brian Stinson |
6e9189 |
<property name="expand">False</property>
|
|
Brian Stinson |
6e9189 |
- <property name="fill">True</property>
|
|
Brian Stinson |
6e9189 |
- <property name="position">4</property>
|
|
Brian Stinson |
6e9189 |
+ <property name="fill">False</property>
|
|
Brian Stinson |
6e9189 |
</packing>
|
|
Brian Stinson |
6e9189 |
</child>
|
|
Brian Stinson |
6e9189 |
<child>
|
|
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 |
6e9189 |
+++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.py 2020-05-01 08:39:51.268940582 -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 |
6e9189 |
@@ -831,7 +829,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 |
6e9189 |
@@ -1009,7 +1007,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 |
6e9189 |
@@ -1059,19 +1057,17 @@ 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 |
6e9189 |
self._autodetectButton.set_active(True)
|
|
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 |
6e9189 |
- elif not self._cdnButton.get_active():
|
|
Brian Stinson |
6e9189 |
- log.debug("source spoke: CDN enabled, enabling CDN button")
|
|
Brian Stinson |
6e9189 |
+ else:
|
|
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 |
6e9189 |
+ self._networkButton.set_active(True)
|
|
Brian Stinson |
6e9189 |
self.data.method.method = None
|
|
Brian Stinson |
6e9189 |
- self._update_CDN_usage()
|
|
Brian Stinson |
6e9189 |
|
|
Brian Stinson |
6e9189 |
self._setup_no_updates()
|
|
Brian Stinson |
6e9189 |
|