Resolve groups to packages

Resolve groups to package list if use zypp but repo only has comps, or
use yum but repo only has patterns file.

diff --git a/mic/configmgr.py b/mic/configmgr.py
index b5818a9..a38ef0e 100644 (file)
--- a/mic/configmgr.py
+++ b/mic/configmgr.py
@@ -124,6 +124,7 @@ class ConfigMgr(object):
         msger.info("Retrieving repo metadata:")
         ksrepos = misc.get_repostrs_from_ks(ks)
         self.create['repomd'] = misc.get_metadata_from_repos(ksrepos, self.create['cachedir'])
+        kickstart.resolve_groups(self.create, self.create['repomd'])
         msger.raw(" DONE")
 
 def getConfigMgr():

diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py
index 4d11cca..bca1d9e 100644 (file)
--- a/mic/kickstart/__init__.py
+++ b/mic/kickstart/__init__.py
@@ -758,18 +758,17 @@ def remove_duplicate_repos(ks):
             i += 1
             j = i + 1
 
-def resolve_groups(creator, repometadata, use_comps = False):
-    pkgmgr = creator.pkgmgr.get_default_pkg_manager
+def resolve_groups(creatoropts, repometadata):
     iszypp = False
-    if creator.pkgmgr.managers.has_key("zypp") and creator.pkgmgr.managers['zypp'] == pkgmgr:
+    if 'zypp' == creatoropts['pkgmgr']:
         iszypp = True
-    ks = creator.ks
+    ks = creatoropts['ks']
 
     for repo in repometadata:
         """ Mustn't replace group with package list if repo is ready for the corresponding package manager """
-        if iszypp and repo["patterns"] and not use_comps:
+        if iszypp and repo["patterns"]:
             continue
-        if not iszypp and repo["comps"] and use_comps:
+        if not iszypp and repo["comps"]:
             continue
 
         """
@@ -778,14 +777,12 @@ def resolve_groups(creator, repometadata, use_comps = False):
             use yum but use_comps is false.
         """
         groupfile = None
-        if iszypp:
-            if (use_comps and repo["comps"]) or (not repo["patterns"] and repo["comps"]):
-                groupfile = repo["comps"]
-                get_pkglist_handler = misc.get_pkglist_in_comps
-        if not iszypp:
-            if (not use_comps and repo["patterns"]) or (not repo["comps"] and repo["patterns"]):
-                groupfile = repo["patterns"]
-                get_pkglist_handler = misc.get_pkglist_in_patterns
+        if iszypp and repo["comps"]:
+            groupfile = repo["comps"]
+            get_pkglist_handler = misc.get_pkglist_in_comps
+        if not iszypp and repo["patterns"]:
+            groupfile = repo["patterns"]
+            get_pkglist_handler = misc.get_pkglist_in_patterns
 
         if groupfile:
             i = 0