[yum-commits] Branch 'yum-3_2_X' - yum/__init__.py

[James Antill]

 yum/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc35eef42e9743d4df152b8c5dbbe875546f2b71
Author: James Antill <james at and.org>
Date:   Wed May 5 02:45:03 2010 -0400

    Parameter was conflicts, the variable passed was called res ... typo fix

diff --git a/yum/__init__.py b/yum/__init__.py
index eb135f4..c2313a0 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1209,7 +1209,7 @@ class YumBase(depsolve.Depsolve):
                     continue
                 if prob.problem == 'conflicts':
                     found = True # all the conflicting pkgs have to be ignored
-                    for res in prob.res:
+                    for res in prob.conflicts:
                         if res.pkgtup not in ignore_pkgtups:
                             found = False
                             break