Blame 0004-Fix-changing-source-don-t-erase-old-environment-TUI-.patch
|
Martin Kolman |
199746 |
From dd98402a1e13e5d2017b21473c4b42906e5754fd Mon Sep 17 00:00:00 2001
|
|
Martin Kolman |
199746 |
From: Jiri Konecny <jkonecny@redhat.com>
|
|
Martin Kolman |
199746 |
Date: Thu, 26 Oct 2017 11:27:45 +0200
|
|
Martin Kolman |
199746 |
Subject: [PATCH] Fix changing source don't erase old environment TUI
|
|
Martin Kolman |
199746 |
(#1505090)
|
|
Martin Kolman |
199746 |
|
|
Martin Kolman |
199746 |
When the installation source changed the environment in the software
|
|
Martin Kolman |
199746 |
selection TUI spoke stays the same. Because of this when user changed
|
|
Martin Kolman |
199746 |
source and leave the same settings for the environment and addons as
|
|
Martin Kolman |
199746 |
before then the payload wasn't restarted at all.
|
|
Martin Kolman |
199746 |
|
|
Martin Kolman |
199746 |
Fixing by removing old saved environment after payload restart.
|
|
Martin Kolman |
199746 |
|
|
Martin Kolman |
199746 |
Resolves: rhbz#1505090
|
|
Martin Kolman |
199746 |
---
|
|
Martin Kolman |
199746 |
pyanaconda/ui/tui/spokes/software_selection.py | 2 ++
|
|
Martin Kolman |
199746 |
1 file changed, 2 insertions(+)
|
|
Martin Kolman |
199746 |
|
|
Martin Kolman |
199746 |
diff --git a/pyanaconda/ui/tui/spokes/software_selection.py b/pyanaconda/ui/tui/spokes/software_selection.py
|
|
Martin Kolman |
199746 |
index 93c868f32..6e108c02a 100644
|
|
Martin Kolman |
199746 |
--- a/pyanaconda/ui/tui/spokes/software_selection.py
|
|
Martin Kolman |
199746 |
+++ b/pyanaconda/ui/tui/spokes/software_selection.py
|
|
Martin Kolman |
199746 |
@@ -116,6 +116,8 @@ class SoftwareSpoke(NormalTUISpoke):
|
|
Martin Kolman |
199746 |
def _payload_finished(self):
|
|
Martin Kolman |
199746 |
self.environment = self.data.packages.environment
|
|
Martin Kolman |
199746 |
self.addons = self._get_selected_addons()
|
|
Martin Kolman |
199746 |
+ self._origEnv = None
|
|
Martin Kolman |
199746 |
+ self._origAddons = None
|
|
Martin Kolman |
199746 |
log.debug("Payload restarted, set new info and clear the old one.")
|
|
Martin Kolman |
199746 |
|
|
Martin Kolman |
199746 |
def _payload_error(self):
|
|
Martin Kolman |
199746 |
--
|
|
Martin Kolman |
199746 |
2.13.6
|
|
Martin Kolman |
199746 |
|