[yum-cvs] plugins/upgrade-helper

[Seth Vidal]

 plugins/upgrade-helper/upgrade-helper.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 98bc1c8fe3528b93268e8527bf9cc38a23fa86d7
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Oct 26 16:34:16 2007 -0400

    make it work with more recent matchPackageNames than when I originally wrote it

diff --git a/plugins/upgrade-helper/upgrade-helper.py b/plugins/upgrade-helper/upgrade-helper.py
index 5c5c9fc..60d7dd7 100644
--- a/plugins/upgrade-helper/upgrade-helper.py
+++ b/plugins/upgrade-helper/upgrade-helper.py
@@ -116,8 +116,12 @@ def preresolve_hook(conduit):
             break
     if runme:
         rpmdb = conduit.getRpmDB()
+        # we should probably consider also allowing version-range packagespecs
+        # like foo < 1.1.1-1 by using rpmdb.getProvides() with some other magic
+        # FIXME FOR LATER
         for pkgglob in stuff_to_remove(conduit.getRepos()):
-            for po in rpmdb.matchPackageNames(pkgglob, casematch=True):
+            ex, m, u = rpmdb.matchPackageNames([pkgglob])
+            for po in ex + m:
                 conduit.info(1, "Setting %s to be removed due to repository metadata in cleanup plugin" % po)
                 ts.addErase(po)