1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
From 25a4f4469e848aea06d4f487a3478ceba75f7f65 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
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 <hongxu.jia@windriver.com>
Rebase for anaconda 34.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Rebase for anaconda 37 on 20221020.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Rebase for anaconda 39 on 20240304.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
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 @@
<item id="https">https://</item>
<item id="ftp">ftp://</item>
<item id="nfs">nfs</item>
- <item id="Closest mirror" translatable="yes">Closest mirror</item>
</items>
<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 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
|
