From 25a4f4469e848aea06d4f487a3478ceba75f7f65 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sat, 29 Jun 2019 16:48:45 +0800 Subject: [PATCH] do not support closest mirror Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia Rebase for anaconda 34. Signed-off-by: Kai Kang Rebase for anaconda 37 on 20221020. Signed-off-by: Kai Kang Rebase for anaconda 39 on 20240304. Signed-off-by: Kai Kang --- pyanaconda/ui/gui/spokes/installation_source.glade | 1 - pyanaconda/ui/gui/spokes/installation_source.py | 1 - pyanaconda/ui/tui/spokes/installation_source.py | 4 ---- 3 files changed, 6 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade index a72bfc72e8..86ed437996 100644 --- a/pyanaconda/ui/gui/spokes/installation_source.glade +++ b/pyanaconda/ui/gui/spokes/installation_source.glade @@ -353,7 +353,6 @@ https:// ftp:// nfs - Closest mirror diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py index 1bcb330614..c4a7932e32 100644 --- a/pyanaconda/ui/gui/spokes/installation_source.py +++ b/pyanaconda/ui/gui/spokes/installation_source.py @@ -613,7 +613,6 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler): self._iso_combo.set_active(active_idx) # We defaults and if the method tells us something different later, we can change it. - self._protocol_combo_box.set_active_id(PROTOCOL_MIRROR) self._url_type_combo_box.set_active_id(URL_TYPE_BASEURL) self._updates_enabled = False diff --git a/pyanaconda/ui/tui/spokes/installation_source.py b/pyanaconda/ui/tui/spokes/installation_source.py index 663b7c3d9c..845e6b0104 100644 --- a/pyanaconda/ui/tui/spokes/installation_source.py +++ b/pyanaconda/ui/tui/spokes/installation_source.py @@ -147,10 +147,6 @@ class SourceSpoke(NormalTUISpoke, SourceSwitchHandler): self._container = ListColumnContainer(1, columns_width=78, spacing=1) if args == self.SET_NETWORK_INSTALL_MODE: - if conf.payload.enable_closest_mirror: - 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