[yum-cvs] yum/yum config.py,1.62,1.63 depsolve.py,1.62,1.63

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv30782/yum

Modified Files:
	config.py depsolve.py 
Log Message:
installonlypkgs should be matched against provides also instead of just
the explicit list of kernel, kernel-modules. fixes the kernel-*-devel
problem  (#155988)


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- config.py	10 May 2005 18:21:11 -0000	1.62
+++ config.py	24 May 2005 14:53:42 -0000	1.63
@@ -209,6 +209,7 @@
                          ('pluginpath', ['/usr/lib/yum-plugins']),
                          ('installonlypkgs', ['kernel', 'kernel-bigmem', 
                                               'kernel-enterprise','kernel-smp',
+                                              'kernel-modules',
                                               'kernel-debug', 'kernel-unsupported', 
                                               'kernel-source', 'kernel-devel']),
                          ('kernelpkgnames', ['kernel','kernel-smp',

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- depsolve.py	26 Mar 2005 07:54:15 -0000	1.62
+++ depsolve.py	24 May 2005 14:53:43 -0000	1.63
@@ -99,10 +99,7 @@
             return 1
         
         provides = po.getProvidesNames()
-        if 'kernel-modules' in provides:
-            return 1
-        
-        if 'kernel' in provides:
+        if filter (lambda prov: prov in self.conf.installonlypkgs, provides):
             return 1
         
         return 0