From 98111851a4464eabd39bf637ffb717ac03cd414e Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: May 12 2020 02:19:00 +0000 Subject: now actually hide the subscription button --- diff --git a/SOURCES/0003-disable-subscription-button.patch b/SOURCES/0003-disable-subscription-button.patch index daa3ea5..df9d2fc 100644 --- a/SOURCES/0003-disable-subscription-button.patch +++ b/SOURCES/0003-disable-subscription-button.patch @@ -1,39 +1,6 @@ -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 ---- anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.glade 2019-12-13 07:20:46.000000000 -0600 -+++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.glade 2020-05-01 08:41:17.708599295 -0500 -@@ -637,22 +637,20 @@ - - - -- -- Red Hat _CDN -- True -- True -+ -+ False -+ False -+ False - False - 12 - True - 0 -- True -- True -- isoRadioButton -+ False -+ False - - - False -- True -- 4 -+ False - - - 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-01 08:39:51.268940582 -0500 ++++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.py 2020-05-11 21:16:25.570796770 -0500 @@ -655,9 +655,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI - method is None - the RedHatCDNEnabled hint needs to be True @@ -45,7 +12,16 @@ diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source @property def completed(self): -@@ -831,7 +829,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI +@@ -813,6 +811,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 +831,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI payloadMgr.addListener(payloadMgr.STATE_ERROR, self._payload_error) # default to Red Hat CDN if no method has been specified @@ -54,7 +30,7 @@ diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source 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 +1007,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI +@@ -1009,7 +1009,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI # Set CDN radio button active, in case external conditions # changed since the last refresh. @@ -63,26 +39,24 @@ diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source log.debug("source spoke: CDN enabled, enabling CDN button") self._cdnButton.set_active(True) elif self.data.method.method == "url": -@@ -1059,19 +1057,17 @@ class SourceSpoke(NormalSpoke, GUISpokeI +@@ -1059,9 +1059,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(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(): -- log.debug("source spoke: CDN enabled, enabling CDN button") -+ else: + elif not self._cdnButton.get_active(): +@@ -1069,7 +1069,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._networkButton.set_active(True) ++ self._cdnButton.set_active(False) self.data.method.method = None -- self._update_CDN_usage() - - self._setup_no_updates() + self._update_CDN_usage()