[rhel7] Filter empty comps groups from both specific and generic lists

David Shea dshea at redhat.com
Wed Aug 6 15:18:26 UTC 2014


Some comps environments list groups that contain only optional members.
This is unhelpful.

Resolves: rhbz#1071359
---
 pyanaconda/ui/gui/spokes/software.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
index fe711b5..abd836b 100644
--- a/pyanaconda/ui/gui/spokes/software.py
+++ b/pyanaconda/ui/gui/spokes/software.py
@@ -301,9 +301,11 @@ class SoftwareSelectionSpoke(NormalSpoke):
             generic = []
 
             for grp in self.payload.groups:
-                if self.payload.environmentHasOption(self.environment, grp):
+                if not self.payload._groupHasInstallableMembers(grp):
+                    continue
+                elif self.payload.environmentHasOption(self.environment, grp):
                     specific.append(grp)
-                elif self.payload._isGroupVisible(grp) and self.payload._groupHasInstallableMembers(grp):
+                elif self.payload._isGroupVisible(grp):
                     generic.append(grp)
 
             for grp in specific:
-- 
2.0.0



More information about the anaconda-patches mailing list