diff options
| -rw-r--r-- | recipes-installer/anaconda/files/0053-do-not-support-closest-mirror.patch | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/recipes-installer/anaconda/files/0053-do-not-support-closest-mirror.patch b/recipes-installer/anaconda/files/0053-do-not-support-closest-mirror.patch index 4c7e516..e1edcb4 100644 --- a/recipes-installer/anaconda/files/0053-do-not-support-closest-mirror.patch +++ b/recipes-installer/anaconda/files/0053-do-not-support-closest-mirror.patch @@ -1,7 +1,7 @@ -From 5a5e93f42b72047042905fa34ea858cc13f7f89b Mon Sep 17 00:00:00 2001 +From 25a4f4469e848aea06d4f487a3478ceba75f7f65 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 26 Jul 2018 17:12:50 +0800 -Subject: [PATCH 53/65] do not support closest mirror +Date: Sat, 29 Jun 2019 16:48:45 +0800 +Subject: [PATCH] do not support closest mirror Upstream-Status: Inappropriate [oe specific] @@ -9,8 +9,8 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- pyanaconda/ui/gui/spokes/installation_source.glade | 1 - pyanaconda/ui/gui/spokes/installation_source.py | 4 ---- - pyanaconda/ui/tui/spokes/installation_source.py | 3 --- - 3 files changed, 8 deletions(-) + pyanaconda/ui/tui/spokes/installation_source.py | 5 ----- + 3 files changed, 10 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade index edd466b..6b6a373 100644 @@ -25,41 +25,43 @@ index edd466b..6b6a373 100644 <signal name="changed" handler="on_protocol_changed" swapped="no"/> </object> diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py -index 9144785..d7c078c 100644 +index 6f725a4..b342c28 100644 --- a/pyanaconda/ui/gui/spokes/installation_source.py +++ b/pyanaconda/ui/gui/spokes/installation_source.py -@@ -864,10 +864,6 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler): +@@ -950,10 +950,6 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler): combo = self.builder.get_object("isoPartitionCombo") combo.set_active(active) - # We default to the mirror list, and then if the method tells us - # something different later, we can change it. -- self._protocolComboBox.set_active_id(PROTOCOL_MIRROR) +- self._protocol_combo_box.set_active_id(PROTOCOL_MIRROR) - if self.data.method.method == "url": - self._networkButton.set_active(True) + self._network_button.set_active(True) diff --git a/pyanaconda/ui/tui/spokes/installation_source.py b/pyanaconda/ui/tui/spokes/installation_source.py -index da65437..6280b08 100644 +index d42423e..ed10deb 100644 --- a/pyanaconda/ui/tui/spokes/installation_source.py +++ b/pyanaconda/ui/tui/spokes/installation_source.py -@@ -117,8 +117,6 @@ class SourceSpoke(NormalTUISpoke, SourceSwitchHandler): +@@ -118,8 +118,6 @@ class SourceSpoke(NormalTUISpoke, SourceSwitchHandler): if not method.dir: return _("Error setting up software source") return os.path.basename(method.dir) -- elif self.payload.baseRepo: +- elif self.payload.base_repo: - return _("Closest mirror") else: return _("Nothing selected") -@@ -157,7 +155,6 @@ class SourceSpoke(NormalTUISpoke, SourceSwitchHandler): +@@ -161,9 +159,6 @@ class SourceSpoke(NormalTUISpoke, SourceSwitchHandler): return if args == self.SET_NETWORK_INSTALL_MODE: -- self._container.add(TextWidget(_("Closest mirror")), self._set_network_close_mirror) - self._container.add(TextWidget("http://"), self._set_network_url, SpecifyRepoSpoke.HTTP) - self._container.add(TextWidget("https://"), self._set_network_url, SpecifyRepoSpoke.HTTPS) - self._container.add(TextWidget("ftp://"), self._set_network_url, SpecifyRepoSpoke.FTP) +- if self.payload.mirrors_available: +- self._container.add(TextWidget(_("Closest mirror")), +- self._set_network_close_mirror) + self._container.add(TextWidget("http://"), + self._set_network_url, + SpecifyRepoSpoke.HTTP) -- 2.7.4 |