[yum-commits] 2 commits - test/simpleupdatetests.py yum/__init__.py

[James Antill]

 test/simpleupdatetests.py |   15 +++++++++++++++
 yum/__init__.py           |    3 +++
 2 files changed, 18 insertions(+)

New commits:
commit fada4b8dbd30d0335a9c07067a74dccec0abbedb
Author: James Antill <james at and.org>
Date:   Mon Sep 29 11:40:54 2014 -0400

    Don't look for upgrades for install only packages. BZ 1063181.

diff --git a/yum/__init__.py b/yum/__init__.py
index a8a4e80..83a546a 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -4654,6 +4654,9 @@ much more problems).
             # don't have to.
             return po.pkgtup in self.up.updating_dict
 
+        if self.allowedMultipleInstalls(po):
+            return False
+
         for ipkg in ipkgs:
             if po.verLE(ipkg):
                 continue
commit 0c10df3e94da2544df4042124069fc247c6849b4
Author: James Antill <james at and.org>
Date:   Mon Sep 29 11:40:12 2014 -0400

    Add simple testcase for installing older intermediate kernel. BZ 1063181.

diff --git a/test/simpleupdatetests.py b/test/simpleupdatetests.py
index bc74de6..0c981c5 100644
--- a/test/simpleupdatetests.py
+++ b/test/simpleupdatetests.py
@@ -1249,3 +1249,18 @@ class SimpleUpdateTests(OperationsTests):
 
         self.assert_(res=='ok', msg)
         self.assertResult((bar11,baz12))
+
+    def testInstall_kernel_intermediate(self):
+        #  Make sure we don't break this again...
+        k11 = FakePackage('kernel', '1', '1', '0', 'i386')
+        k12 = FakePackage('kernel', '1', '2', '0', 'i386')
+        k13 = FakePackage('kernel', '1', '3', '0', 'i386')
+        k14 = FakePackage('kernel', '1', '4', '0', 'i386')
+        k15 = FakePackage('kernel', '1', '5', '0', 'i386')
+
+        res, msg = self.runOperation(['install', 'kernel-1-2'],
+                                     [k11, k13, k14],
+                                     [k11, k12, k13, k14, k15])
+
+        self.assert_(res=='ok', msg)
+        self.assertResult((k11, k12, k13, k14))