Yet another F27 Beta hotfix - fix missing environment translation

- Fix missing enviromnent translation (#1491119) (jkonecny)

0004-Rename-processingDone-to-processing_done-variable.patch

@@ -0,0 +1,33 @@
+From f3b3a6ff6281c5cffd5c7a2b6b1d2bde0740999a Mon Sep 17 00:00:00 2001
+From: Jiri Konecny <jkonecny@redhat.com>
+Date: Thu, 21 Sep 2017 12:33:15 +0200
+Subject: [PATCH 1/3] Rename processingDone to processing_done variable
+
+Rename variable to move closer to pep8.
+---
+ pyanaconda/ui/tui/spokes/software_selection.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pyanaconda/ui/tui/spokes/software_selection.py b/pyanaconda/ui/tui/spokes/software_selection.py
+index 4fb30bba3..bb78b7560 100644
+--- a/pyanaconda/ui/tui/spokes/software_selection.py
++++ b/pyanaconda/ui/tui/spokes/software_selection.py
+@@ -174,12 +174,12 @@ class SoftwareSpoke(NormalTUISpoke):
+            if the spoke starts a thread. It should make sure it doesn't access
+            things until they are completely setup.
+         """
+-        processingDone = self.ready and not self.errors and self.txid_valid
++        processing_done = self.ready and not self.errors and self.txid_valid
+ 
+         if flags.automatedInstall or self._kickstarted:
+-            return processingDone and self.payload.baseRepo and self.data.packages.seen
++            return processing_done and self.payload.baseRepo and self.data.packages.seen
+         else:
+-            return processingDone and self.payload.baseRepo and self.environment is not None
++            return processing_done and self.payload.baseRepo and self.environment is not None
+ 
+     def refresh(self, args=None):
+         """ Refresh screen. """
+-- 
+2.13.5
+

0005-Fix-test-for-unset-TUI-software-environment-1491119.patch

@@ -0,0 +1,30 @@
+From a31e9a41b3e48a325970933f0abddb5fc2021ee0 Mon Sep 17 00:00:00 2001
+From: Jiri Konecny <jkonecny@redhat.com>
+Date: Thu, 21 Sep 2017 18:10:53 +0200
+Subject: [PATCH 2/3] Fix test for unset TUI software environment (#1491119)
+
+The check was done as `if env:` problem is that `env` is a number. If
+environment with index 0 was selected this condition went as no environment
+selected.
+
+Related: rhbz#1491119
+---
+ pyanaconda/ui/tui/spokes/software_selection.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyanaconda/ui/tui/spokes/software_selection.py b/pyanaconda/ui/tui/spokes/software_selection.py
+index bb78b7560..90de9e3a1 100644
+--- a/pyanaconda/ui/tui/spokes/software_selection.py
++++ b/pyanaconda/ui/tui/spokes/software_selection.py
+@@ -288,7 +288,7 @@ class SoftwareSpoke(NormalTUISpoke):
+         self.environment = self._selected_environment
+         self.addons = self._addons_selection if self.environment is not None else set()
+ 
+-        if not self.environment:
++        if self.environment is None:
+             return
+ 
+         changed = False
+-- 
+2.13.5
+

0006-Fix-missing-id-to-name-environment-transition-149111.patch

@@ -0,0 +1,67 @@
+From 6783da7587ec42687a21696bacd21b808df60f50 Mon Sep 17 00:00:00 2001
+From: Jiri Konecny <jkonecny@redhat.com>
+Date: Thu, 21 Sep 2017 13:14:46 +0200
+Subject: [PATCH 3/3] Fix missing id to name environment transition (#1491119)
+
+Regression from Anaconda to Simpleline migration. Return method for
+transition environment id to name which was removed during migration.
+
+Resolves: rhbz#1491119
+---
+ pyanaconda/ui/tui/spokes/software_selection.py | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/pyanaconda/ui/tui/spokes/software_selection.py b/pyanaconda/ui/tui/spokes/software_selection.py
+index 90de9e3a1..9d3aad0ce 100644
+--- a/pyanaconda/ui/tui/spokes/software_selection.py
++++ b/pyanaconda/ui/tui/spokes/software_selection.py
+@@ -117,7 +117,16 @@ class SoftwareSpoke(NormalTUISpoke):
+     def _payload_error(self):
+         self.errors = [payloadMgr.error]
+ 
+-    def _get_environment_id(self, environment):
++    def _translate_env_selection_to_name(self, selection):
++        """ Return the selected environment name or None.
++            Selection can be None during kickstart installation.
++        """
++        if selection is not None:
++            return self.payload.environments[selection]
++        else:
++            return None
++
++    def _translate_env_name_to_id(self, environment):
+         """ Return the id of the selected environment or None. """
+         if environment is None:
+             return None
+@@ -250,8 +259,8 @@ class SoftwareSpoke(NormalTUISpoke):
+                 # The environment was selected, switch screen
+                 elif args is None:
+                     # Get addons for the selected environment
+-                    environment = self._selected_environment
+-                    environment_id = self._get_environment_id(environment)
++                    environment = self._translate_env_selection_to_name(self._selected_environment)
++                    environment_id = self._translate_env_name_to_id(environment)
+                     addons = self._get_available_addons(environment_id)
+ 
+                     # Switch the screen
+@@ -285,7 +294,7 @@ class SoftwareSpoke(NormalTUISpoke):
+ 
+     def _apply(self):
+         """ Private apply. """
+-        self.environment = self._selected_environment
++        self.environment = self._translate_env_selection_to_name(self._selected_environment)
+         self.addons = self._addons_selection if self.environment is not None else set()
+ 
+         if self.environment is None:
+@@ -305,7 +314,7 @@ class SoftwareSpoke(NormalTUISpoke):
+                 self.data.packages.groupList = []
+                 self.payload.selectEnvironment(self.environment)
+ 
+-                environment_id = self._get_environment_id(self.environment)
++                environment_id = self._translate_env_name_to_id(self.environment)
+                 available_addons = self._get_available_addons(environment_id)
+ 
+                 for addon_id in available_addons:
+-- 
+2.13.5
+

anaconda.spec

@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 27.20.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -24,6 +24,12 @@ 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
 
+
+# Fix missing environment translation (#1491119)
+Patch3: 0004-Rename-processingDone-to-processing_done-variable.patch
+Patch4: 0005-Fix-test-for-unset-TUI-software-environment-1491119.patch
+Patch5: 0006-Fix-missing-id-to-name-environment-transition-149111.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -251,6 +257,9 @@ runtime on NFS/HTTP/FTP servers or local disks.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -344,6 +353,9 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Thu Sep 21 2017 Martin Kolman <mkolman@redhat.com> - 27.20.1-5
+- Fix missing enviromnent translation (#1491119) (jkonecny)
+
 * Mon Sep 18 2017 Martin Kolman <mkolman@redhat.com> - 27.20.1-4
 - Don't setup the hub twice (#1491333) (vponcova)