[yum-git] plugins/fedorakmod

[Jack Neely]

 plugins/fedorakmod/fedorakmod.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d3d5e704b85ad97b1549e3727003b284fe51320f
Author: Jack Neely <jjneely at ncsu.edu>
Date:   Tue Jun 3 17:14:05 2008 -0400

    Port from upstream changes to ignore kernels that are to be erased.

diff --git a/plugins/fedorakmod/fedorakmod.py b/plugins/fedorakmod/fedorakmod.py
index b381448..c8afe78 100644
--- a/plugins/fedorakmod/fedorakmod.py
+++ b/plugins/fedorakmod/fedorakmod.py
@@ -282,6 +282,12 @@ def postresolve_hook(c):
     installedModules = getInstalledModules(c)
 
     for te in c.getTsInfo().getMembers():
+        isKernel = len(kernelProvides.intersection(te.po.provides_names)) > 0
+        if te.ts_state == 'e' and isKernel:
+            # If a kernel is set to be erased then we don't want to
+            # consider it in our dep checking.
+            c.info(2, "Excluding to be erased: " + str(te.po))
+            installedKernels.remove(te.po)
         if te.ts_state not in ('i', 'u'):
             continue
         if "kernel-modules" in te.po.provides_names:
@@ -289,7 +295,7 @@ def postresolve_hook(c):
             for po in avaModules:
                 if te.po.pkgtup == po.pkgtup:
                     avaModules.remove(po)
-        if kernelProvides.intersection(te.po.provides_names) != Set([]):
+        if isKernel:
             newKernels.append(te.po)
 
     # Install modules for all kernels