fix selection of lang specific packages (ie kde-i18n-foo) for mandatory/dependency packages. Component.addDependencyPackage is only used by this part of packages.py, so changing it is safe

2 files changed, 28 insertions, 4 deletions

diff --git a/comps.py b/comps.py
index 4a85081c5..cf419897b 100644
--- a/comps.py
+++ b/comps.py
@@ -364,7 +364,13 @@ class Component:
 
     def addDependencyPackage(self, p):
         if not self.depsDict.has_key(p):
-            self.depsDict[p] = 0
+            self.depsDict[p.name] = 1
+            # make sure it's registered in this component
+            p.registerComponent(self)
+            # and it also has to be in the pkgDict
+            self.pkgDict[p] = None
+        else:
+            self.depsDict[p.name] = self.depsDict[p.name] + 1
 
     def selectOptionalPackage(self, p):
         if isinstance(p, Package):
diff --git a/packages.py b/packages.py
index 36b6fd848..cdfab075d 100644
--- a/packages.py
+++ b/packages.py
@@ -28,6 +28,7 @@ import kudzu
 from flags import flags
 from constants import *
 from syslogd import syslog
+from comps import PKGTYPE_MANDATORY, PKGTYPE_DEFAULT
 
 from rhpl.log import log
 from rhpl.translate import _
@@ -958,6 +959,7 @@ def doPostInstall(method, id, intf, instPath):
         # FIXME: hack to install the comps package
         if (id.compspkg is not None and
             os.access(id.compspkg, os.R_OK)):
+            log("found the comps package")
             try:
                 # ugly hack
                 path = id.compspkg.split("/mnt/sysimage")[1]
@@ -984,6 +986,8 @@ def doPostInstall(method, id, intf, instPath):
                     os.unlink(id.compspkg)
                 except:
                     pass
+        else:
+            log("no comps package found")
                 
         w.set(6)
 
@@ -1144,8 +1148,22 @@ def selectLanguageSupportGroups(comps, langSupport):
                     # add to the deps in the dependencies structure --
                     # this will take care of if we're ever added as a dep
                     comps.compsxml.packages[req].dependencies.append(package)
-                    # also add to all components for which the req is
-                    # registered as PKGTYPE_DEFAULT
+                    print "adding %s as a dep of %s" %(package, comps.compsxml.packages[req].name)
+                    # also add to components as needed
+                    # if the req is PKGTYPE_MANDATORY, then just add to the
+                    # depsDict.  if the req is PKGTYPE_DEFAULT, add it
+                    # as DEFAULT
                     pkg = comps.packages[package]
                     for comp in comps.packages[req].comps:
-                        comp.addPackage(pkg, 1)
+                        if comp.newpkgDict.has_key(req):
+                            if comp.newpkgDict[req][0] == PKGTYPE_MANDATORY:
+                                print "adding %s to comp %s as dep" %(pkg.name, comp.name)
+                                comp.addDependencyPackage(pkg)
+                            else:
+                                print "adding %s to comp %s" %(pkg.name, comp.name)
+                                comp.addPackage(pkg, PKGTYPE_DEFAULT)
+                        elif comp.depsDict.has_key(req):
+                            comp.addDependencyPackage(pkg)
+                        else:
+                            print "unable to find how %s is in comp %s" %(pkg.name, comp.name)
+    comps.updateSelections()