revisor/base.py | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
New commits:
commit fbf6ff3d25bf2382a93673fc8219cf0ce7eb317c
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Thu Dec 11 16:58:10 2008 +0100
Fix the ksgroup.name vs. ksgroup being a name issue
diff --git a/revisor/base.py b/revisor/base.py
index 0848e04..00df975 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -474,22 +474,33 @@ class RevisorBase:
## Add packages from Groups in ksdata
##
for ksgroup in groupList:
- if not self.cfg.yumobj.comps.has_group(ksgroup.name):
- self.log.warning(_("No such group %s") % ksgroup.name )
+ if hasattr(ksgroup,"name"):
+ group_name = ksgroup.name
+ else:
+ group_name = ksgroup
+
+ if not self.cfg.yumobj.comps.has_group(group_name):
+ self.log.warning(_("No such group %s") % group_name )
continue
else:
- self.log.debug(_("Found group: %s") % ksgroup.name)
+ self.log.debug(_("Found group: %s") % group_name)
# Get group object from comps
- grp = self.cfg.yumobj.comps.return_group(ksgroup.name)
+ grp = self.cfg.yumobj.comps.return_group(group_name)
txmbrs_used = self.cfg.yumobj.selectGroup(grp.name)
- if ksgroup.include >= kickstart.constants.GROUP_REQUIRED:
+ try:
+ if ksgroup.include >= kickstart.constants.GROUP_REQUIRED:
+ pkglist.extend(grp.mandatory_packages.keys())
+ if ksgroup.include >= kickstart.constants.GROUP_DEFAULT:
+ pkglist.extend(grp.default_packages.keys())
+ if ksgroup.include >= kickstart.constants.GROUP_ALL:
+ pkglist.extend(grp.optional_packages.keys())
+ except:
+ # If such fails, just include the mandatory and defaults
pkglist.extend(grp.mandatory_packages.keys())
- if ksgroup.include >= kickstart.constants.GROUP_DEFAULT:
pkglist.extend(grp.default_packages.keys())
- if ksgroup.include >= kickstart.constants.GROUP_ALL:
- pkglist.extend(grp.optional_packages.keys())
+
##
## Pull the conditional packages in
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
