Another F27 Beta hotfix - automated installation

- Don't setup the hub twice (#1491333) (vponcova)
This commit is contained in:
Martin Kolman 2017-09-18 14:14:26 +02:00
parent 9fe8a4bbc9
commit 09f8c9df02
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From 8e62087392d0bdfe3d119d07df5fea42a419edfb Mon Sep 17 00:00:00 2001
From: Vendula Poncova <vponcova@redhat.com>
Date: Thu, 14 Sep 2017 13:40:54 +0200
Subject: [PATCH] Don't setup the hub twice (#1491333)
We need to make sure, that the simpleline's setup is called as well,
so simpleline will remember that the setup was already done.
Resolves: rhbz#1491333
---
pyanaconda/ui/tui/hubs/__init__.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/ui/tui/hubs/__init__.py b/pyanaconda/ui/tui/hubs/__init__.py
index 616b40bf6..90af386c3 100644
--- a/pyanaconda/ui/tui/hubs/__init__.py
+++ b/pyanaconda/ui/tui/hubs/__init__.py
@@ -62,6 +62,7 @@ class TUIHub(TUIObject, common.Hub):
self.input_required = True
def setup(self, args="anaconda"):
+ TUIObject.setup(self, args)
environment = args
cats_and_spokes = self._collectCategoriesAndSpokes()
categories = cats_and_spokes.keys()
--
2.13.5

View File

@ -3,7 +3,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 27.20.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+ and MIT
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
@ -21,6 +21,9 @@ Patch0: 0001-Fix-catch-TUI-not-main-thread-exceptions.patch
# Another UEFI booting fix (#1489144)
Patch1: 0002-Make-EFIGRUB._efi_binary-a-property-not-a-method.patch
# Fix automatic installation issues (#1491333)
Patch2: 0003-Don-t-setup-the-hub-twice-1491333.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -247,6 +250,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure
@ -340,6 +344,9 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Thu Sep 18 2017 Martin Kolman <mkolman@redhat.com> - 27.20.1-4
- Don't setup the hub twice (#1491333) (vponcova)
* Thu Sep 07 2017 Martin Kolman <mkolman@redhat.com> - 27.20.1-3
- Make EFIGRUB._efi_binary a property, not a method (adamw)