Skip to content

Commit ed8ffc7

Browse files
author
Martin Hatina
committed
do not throw exception when missing optional group (RhBug:1609289)
1 parent 2db5439 commit ed8ffc7

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

dnf/comps.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,17 +249,30 @@ def _build_group(self, grp_id):
249249
raise ValueError(msg % (grp_id.name, self.id))
250250
return grp
251251

252+
def _build_groups(self, ids):
253+
groups = []
254+
for gi in ids:
255+
try:
256+
groups.append(self._build_group(gi))
257+
except ValueError as e:
258+
logger.error(e)
259+
260+
return groups
261+
252262
def groups_iter(self):
253263
for grp_id in itertools.chain(self.group_ids, self.option_ids):
254-
yield self._build_group(grp_id)
264+
try:
265+
yield self._build_group(grp_id)
266+
except ValueError as e:
267+
logger.error(e)
255268

256269
@property
257270
def mandatory_groups(self):
258-
return [self._build_group(gi) for gi in self.group_ids]
271+
return self._build_groups(self.group_ids)
259272

260273
@property
261274
def optional_groups(self):
262-
return [self._build_group(gi) for gi in self.option_ids]
275+
return self._build_groups(self.option_ids)
263276

264277
class Group(Forwarder):
265278
# :api

0 commit comments

Comments
 (0)