[rhel7-branch 2/2] Don't clear the _currentIsoFile if another iso was selected (#1274855)

bcl installerbot-noreply at redhat.com
Mon Nov 9 21:50:27 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

It was clearing the selection even if another iso was selected.  This
resulted in the summary hub displaying 'Error setting up ISO file', but
still allowing installation to continue. It should only do that if
something other than an iso is selected.

Related: rhbz#1274855
---
 pyanaconda/ui/gui/spokes/source.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index e9cad81..9afe8ef 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -484,9 +484,11 @@ def _method_changed(self):
         # If the user moved from an HDISO method to some other, we need to
         # clear the protected bit on that device.
         if old_source.method == "harddrive" and old_source.partition:
-            self._currentIsoFile = None
-            self._isoChooserButton.set_label(self._origIsoChooserButton)
-            self._isoChooserButton.set_use_underline(True)
+            if not self._isoButton.get_active():
+                # Only clear this if iso isn't selected
+                self._currentIsoFile = None
+                self._isoChooserButton.set_label(self._origIsoChooserButton)
+                self._isoChooserButton.set_use_underline(True)
 
             if old_source.partition in self.storage.config.protectedDevSpecs:
                 self.storage.config.protectedDevSpecs.remove(old_source.partition)


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/0b092b8c1642c8551c381561983254156097ce81


More information about the anaconda-patches mailing list