New: [rhinstaller/anaconda/pulls/167 master] Do not check dependencies on invalid payloads

[master 1/1] Do not check dependencies on invalid payloads

[dashea]

From: David Shea

---
 pyanaconda/ui/gui/spokes/software.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
index 5bd5c2e..ed1a395 100644
--- a/pyanaconda/ui/gui/spokes/software.py
+++ b/pyanaconda/ui/gui/spokes/software.py
@@ -95,6 +95,9 @@ def __init__(self, *args, **kwargs):
         # Whether we are using package selections from a kickstart
         self._kickstarted = flags.automatedInstall and self.data.packages.seen

+        # Whether the payload is in an error state
+        self._error = False
+
         # Register event listeners to update our status on payload events
         payloadMgr.addListener(payloadMgr.STATE_PACKAGE_MD, self._downloading_package_md)
         payloadMgr.addListener(payloadMgr.STATE_GROUP_MD, self._downloading_group_md)
@@ -103,6 +106,9 @@ def __init__(self, *args, **kwargs):

# Payload event handlers
     def _downloading_package_md(self):
+        # Reset the error state from previous payloads
+        self._error = False
+
         hubQ.send_message(self.__class__.__name__, _(constants.PAYLOAD_STATUS_PACKAGE_MD))

def _downloading_group_md(self):
@@ -112,6 +118,7 @@ def _payload_finished(self):
         self.environment = self.data.packages.environment

def _payload_error(self):
+        self._error = True
         hubQ.send_message(self.__class__.__name__, payloadMgr.error)

def _apply(self):
@@ -262,7 +269,8 @@ def _initialize(self):

# If packages were provided by an input kickstart file (or some other means),
         # we should do dependency solving here.
-        self._apply()
+        if not self._error:
+            self._apply()

def _parseEnvironments(self):
         # Set all of the add-on selection states to the default

[rhinstaller/anaconda/pulls/167 master] Do not check dependencies on invalid payloads

[dashea]

Looks good to me.

[rhinstaller/anaconda/pulls/167 master] Do not check dependencies on invalid payloads

[dashea]

Added label: ACK.

[rhinstaller/anaconda/pulls/167 master] Do not check dependencies on invalid payloads

[dashea]

Pushed.

[rhinstaller/anaconda/pulls/167 master] Do not check dependencies on invalid payloads

[dashea]

Closed.