diff --git a/SOURCES/0003-disable-subscription-button.patch b/SOURCES/0003-disable-subscription-button.patch index df9d2fc..9356722 100644 --- a/SOURCES/0003-disable-subscription-button.patch +++ b/SOURCES/0003-disable-subscription-button.patch @@ -1,6 +1,6 @@ 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-11 21:16:25.570796770 -0500 ++++ 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 @@ -12,7 +12,23 @@ diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source @property def completed(self): -@@ -813,6 +811,8 @@ class SourceSpoke(NormalSpoke, GUISpokeI +@@ -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) @@ -21,7 +37,7 @@ diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source # 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 +@@ -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 @@ -30,7 +46,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 +1009,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI +@@ -1009,7 +1002,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI # Set CDN radio button active, in case external conditions # changed since the last refresh. @@ -39,7 +55,7 @@ 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,9 +1059,9 @@ class SourceSpoke(NormalSpoke, GUISpokeI +@@ -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() @@ -51,7 +67,7 @@ diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source 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 +1069,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI +@@ -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