This method is used in the software spoke to deselect groups added via the environment, and having the optional groups in there doesn't do any good since any selected optional groups would have been selected by the user. --- pyanaconda/packaging/dnfpayload.py | 5 +---- pyanaconda/packaging/yumpayload.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index 71cf5fb..ffdbc0c 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -29,7 +29,6 @@ from pyanaconda.progress import progressQ
import ConfigParser import collections -import itertools import logging import multiprocessing import operator @@ -558,9 +557,7 @@ class DNFPayload(packaging.PackagePayload): env = self._base.comps.environment_by_pattern(environmentid) if env is None: raise packaging.NoSuchGroup(environmentid) - group_ids = (id_.name for id_ in env.group_ids) - option_ids = (id_.name for id_ in env.option_ids) - return list(itertools.chain(group_ids, option_ids)) + return [id_.name for id_ in env.group_ids]
def environmentHasOption(self, environmentid, grpid): env = self._base.comps.environment_by_pattern(environmentid) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 58ace3a..b7e9e0f 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -1011,7 +1011,7 @@ reposdir=%s raise NoSuchGroup(environmentid)
environment = groups.return_environment(environmentid) - return environment.groups + environment.options + return environment.groups
### ### METHODS FOR WORKING WITH GROUPS