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

[James Antill]

 test/depsolvetests.py |    2 +-
 yum/__init__.py       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dfc451464b7646d0932e976dab9fc2679961def3
Author: James Antill <james at and.org>
Date:   Tue Apr 7 19:06:44 2009 -0400

    Fix copy and paste typo

diff --git a/yum/__init__.py b/yum/__init__.py
index a6a84b8..45378e1 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -708,7 +708,7 @@ class YumBase(depsolve.Depsolve):
             msg = _('There are unfinished transactions remaining. You might ' \
                     'consider running yum-complete-transaction first to finish them.' )
             self.logger.critical(msg)
-            base.yumUtilsMsg(self.logger.critical, "yum-complete-transaction")
+            self.yumUtilsMsg(self.logger.critical, "yum-complete-transaction")
             time.sleep(3)
 
         self.plugins.run('preresolve')
commit 2320a9e2342382017c357aaf62ada4ba0c94d271
Author: James Antill <james at and.org>
Date:   Tue Apr 7 19:03:49 2009 -0400

    Fix bad testcase, arches are allowed to move from .i586 to .i686 on update

diff --git a/test/depsolvetests.py b/test/depsolvetests.py
index 12cdcc7..2ff4f85 100644
--- a/test/depsolvetests.py
+++ b/test/depsolvetests.py
@@ -844,7 +844,7 @@ class DepsolveTests(DepsolveTests):
         self.xsack.addPackage(po3)
 
         self.assertEquals('ok', *self.resolveCode())
-        self.assertResult((xpo, po3))
+        self.assertResult((xpo, po2))
 
     def testMultiPkgVersions4(self):
         ipo1 = FakePackage('abcd', arch='i386')