rpms
/
anaconda
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New version 33.25.2-4 

- Fix the combo box for an URL type of additional repositories (#1879127) (vponcova)
This commit is contained in:
Martin Kolman 2020-09-17 13:05:53 +02:00
parent 738e5ce50c
commit a423a12018
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0003-Fix-the-combo-box-for-an-URL-type-of-additional-repo.patch Normal file
View File

@ -0,0 +1,40 @@
From 2585d3380ebbd516757a2420486e68e2809961db Mon Sep 17 00:00:00 2001
From: Vendula Poncova <vponcova@redhat.com>
Date: Tue, 15 Sep 2020 17:25:28 +0200
Subject: [PATCH] Fix the combo box for an URL type of additional repositories
(#1879127)
In the commit ff9a7e1, we introduced new constants for the URL source types with
values 'BASEURL', 'MIRRORLIST' and 'METALINK'. In the commit cc2c3d3, we started
to use these constants in the Installation Source spoke and removed the old ones
with values 'url', 'mirrorlist' and 'metalink'. We updated the combo box for the
base repository, but forgot to update the combo box for additional repositories.
The combo box items have to have ids that match the values of the constants,
otherwise the URL type of additional repositories will be always 'BASEURL'.
Resolves: rhbz#1879127
---
pyanaconda/ui/gui/spokes/installation_source.glade | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade
index e53fa230c..bc07a4a7b 100644
--- a/pyanaconda/ui/gui/spokes/installation_source.glade
+++ b/pyanaconda/ui/gui/spokes/installation_source.glade
@@ -1296,9 +1296,9 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<items>
- <item id="url" translatable="yes">repository URL</item>
- <item id="mirrorlist" translatable="yes">mirrorlist</item>
- <item id="metalink" translatable="yes">metalink</item>
+ <item id="BASEURL" translatable="yes">repository URL</item>
+ <item id="MIRRORLIST" translatable="yes">mirrorlist</item>
+ <item id="METALINK" translatable="yes">metalink</item>
</items>
<signal name="changed" handler="on_repo_url_type_changed" swapped="no"/>
</object>
--
2.26.2

8
anaconda.spec
View File

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 33.25.2
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -18,6 +18,9 @@ Patch1: 0001-Always-clear-treeinfo-metadata-1872056.patch
# F33 Beta freeze exception
Patch2: 0002-Add-the-DBus-method-IsDeviceShrinkable-1875677.patch
# F33 Beta freeze exception
Patch3: 0003-Fix-the-combo-box-for-an-URL-type-of-additional-repo.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -372,6 +375,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Thu Sep 17 2020 Martin Kolman <mkolman@redhat.com> - 33.25.2-4
- Fix the combo box for an URL type of additional repositories (#1879127) (vponcova)
* Wed Sep 09 2020 Martin Kolman <mkolman@redhat.com> - 33.25.2-3
- Add the DBus method IsDeviceShrinkable (#1875677) (vponcova)