[yum-commits] plugins/remove-with-leaves

[skvidal at osuosl.org]

 plugins/remove-with-leaves/remove-with-leaves.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4b0ab9be3713eff70c753e9d1d7458226242741d
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Sep 29 10:55:01 2008 -0400

    make sure we don't remove if things are just being updated :)

diff --git a/plugins/remove-with-leaves/remove-with-leaves.py b/plugins/remove-with-leaves/remove-with-leaves.py
index 5b3d710..49e75fa 100644
--- a/plugins/remove-with-leaves/remove-with-leaves.py
+++ b/plugins/remove-with-leaves/remove-with-leaves.py
@@ -65,7 +65,7 @@ def postresolve_hook(conduit):
     oldlen = 0
     while oldlen != len(tsInfo):
         oldlen = len(tsInfo)
-        for txmbr in tsInfo.getMembersWithState(output_states=TS_REMOVE_STATES):
+        for txmbr in tsInfo.getMembersWithState(output_states=[TS_ERASE]):
             if conduit._base.allowedMultipleInstalls(txmbr.po): 
                 # these make everything dodgy, skip it
                 continue
@@ -73,13 +73,13 @@ def postresolve_hook(conduit):
                 if req[0].startswith('rpmlib('):
                     continue
                 for pkg in rpmdb.getProvides(req[0], req[1], req[2]):
-                    if pkg.pkgtup in [ txmbr.po.pkgtup for txmbr in tsInfo.getMembersWithState(output_states=TS_REMOVE_STATES) ]:
+                    if pkg.pkgtup in [ txmbr.po.pkgtup for txmbr in tsInfo.getMembersWithState(output_states=[TS_ERASE]) ]:
                         continue # skip ones already marked for remove, kinda pointless
                     if pkg.name in ignore_list: # there are some pkgs which are NEVER going to be leafremovals
                         continue
                     non_removed_requires = []
                     for req_pkgtup in _requires_this_package(rpmdb,pkg):
-                        pkgtups = [ txmbr.po.pkgtup for txmbr in tsInfo.getMembersWithState(output_states=TS_REMOVE_STATES) ]
+                        pkgtups = [ txmbr.po.pkgtup for txmbr in tsInfo.getMembersWithState(output_states=[TS_ERASE]) ]
                         if req_pkgtup not in pkgtups:
                             non_removed_requires.append(req_pkgtup)