[yum-git] 2 commits - plugins/versionlock

[James Antill]

 plugins/versionlock/versionlock.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit d57f7650453411afb5e4c8f91c801ddfbdf3861e
Author: James Antill <james at and.org>
Date:   Wed Aug 27 12:00:42 2008 -0400

    Fix follow_obsoletes in versionlock

diff --git a/plugins/versionlock/versionlock.py b/plugins/versionlock/versionlock.py
index ad8f1bd..b2c6e38 100644
--- a/plugins/versionlock/versionlock.py
+++ b/plugins/versionlock/versionlock.py
@@ -56,7 +56,7 @@ def exclude_hook(conduit):
     if conduit.confBool('main', 'follow_obsoletes', default=False):
         #  If anything obsoletes something that we have versionlocked ... then
         # remove all traces of that too.
-        for (pkgtup, instTup) in conduit._base.up.returnObsoletes():
+        for (pkgtup, instTup) in conduit._base.up.getObsoletesTuples():
             if instTup[0] not in pkgs:
                 continue
             # If anyone versions a pkg this, they need a good kicking
commit 90048b762d35ec1f64e16a512aa9bb97b188416f
Author: James Antill <james at and.org>
Date:   Wed Aug 27 11:14:16 2008 -0400

    Fix follow_obsoletes in versionlock

diff --git a/plugins/versionlock/versionlock.py b/plugins/versionlock/versionlock.py
index 7caefc7..ad8f1bd 100644
--- a/plugins/versionlock/versionlock.py
+++ b/plugins/versionlock/versionlock.py
@@ -56,13 +56,11 @@ def exclude_hook(conduit):
     if conduit.confBool('main', 'follow_obsoletes', default=False):
         #  If anything obsoletes something that we have versionlocked ... then
         # remove all traces of that too.
-        obs = conduit._base.pkgSack.returnObsoletes()
-        for ob in obs:
-            for po in obs[ob]:
-                if po.name not in pkgs:
-                    continue
-                # If anyone versions a pkg this, they need a good kicking
-                pkgs.setdefault(ob[0], []).append(('0', '0', '0'))
+        for (pkgtup, instTup) in conduit._base.up.returnObsoletes():
+            if instTup[0] not in pkgs:
+                continue
+            # If anyone versions a pkg this, they need a good kicking
+            pkgs.setdefault(pkgtup[0], []).append(('0', '0', '0'))
 
     for pkgname in pkgs:
         for pkg in vl_search(conduit, pkgname):