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
|
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>
---
pyanaconda/ui/gui/spokes/installation_source.glade | 1 -
pyanaconda/ui/gui/spokes/installation_source.py | 4 ----
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
--- a/pyanaconda/ui/gui/spokes/installation_source.glade
+++ b/pyanaconda/ui/gui/spokes/installation_source.glade
@@ -772,7 +772,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 6f725a4..b342c28 100644
--- a/pyanaconda/ui/gui/spokes/installation_source.py
+++ b/pyanaconda/ui/gui/spokes/installation_source.py
@@ -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._protocol_combo_box.set_active_id(PROTOCOL_MIRROR)
-
if self.data.method.method == "url":
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 d42423e..ed10deb 100644
--- a/pyanaconda/ui/tui/spokes/installation_source.py
+++ b/pyanaconda/ui/tui/spokes/installation_source.py
@@ -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.base_repo:
- return _("Closest mirror")
else:
return _("Nothing selected")
@@ -161,9 +159,6 @@ class SourceSpoke(NormalTUISpoke, SourceSwitchHandler):
return
if args == self.SET_NETWORK_INSTALL_MODE:
- 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
|
