|
 |
5e9bef |
commit fada4b8dbd30d0335a9c07067a74dccec0abbedb
|
|
|
5e9bef |
Author: James Antill <james@and.org>
|
|
|
5e9bef |
Date: Mon Sep 29 11:40:54 2014 -0400
|
|
|
5e9bef |
|
|
|
5e9bef |
Don't look for upgrades for install only packages. BZ 1063181.
|
|
|
5e9bef |
|
|
|
5e9bef |
diff --git a/yum/__init__.py b/yum/__init__.py
|
|
|
5e9bef |
index a8a4e80..83a546a 100644
|
|
|
5e9bef |
--- a/yum/__init__.py
|
|
|
5e9bef |
+++ b/yum/__init__.py
|
|
|
5e9bef |
@@ -4654,6 +4654,9 @@ much more problems).
|
|
|
5e9bef |
# don't have to.
|
|
|
5e9bef |
return po.pkgtup in self.up.updating_dict
|
|
|
5e9bef |
|
|
|
5e9bef |
+ if self.allowedMultipleInstalls(po):
|
|
|
5e9bef |
+ return False
|
|
|
5e9bef |
+
|
|
|
5e9bef |
for ipkg in ipkgs:
|
|
|
5e9bef |
if po.verLE(ipkg):
|
|
|
5e9bef |
continue
|
|
|
5e9bef |
diff -up yum-3.4.3/test/simpleupdatetests.py.old yum-3.4.3/test/simpleupdatetests.py
|
|
|
5e9bef |
--- yum-3.4.3/test/simpleupdatetests.py.old 2014-09-30 11:01:39.000000000 +0200
|
|
|
5e9bef |
+++ yum-3.4.3/test/simpleupdatetests.py 2014-09-30 11:02:19.513283044 +0200
|
|
|
5e9bef |
@@ -1230,3 +1230,18 @@ class SimpleUpdateTests(OperationsTests)
|
|
|
5e9bef |
|
|
|
5e9bef |
self.assert_(self._pkg2txmbr(foo11).reason == 'user')
|
|
|
5e9bef |
self.assert_(self._pkg2txmbr(bar11).reason == 'blahg')
|
|
|
5e9bef |
+
|
|
|
5e9bef |
+ def testInstall_kernel_intermediate(self):
|
|
|
5e9bef |
+ # Make sure we don't break this again...
|
|
|
5e9bef |
+ k11 = FakePackage('kernel', '1', '1', '0', 'i386')
|
|
|
5e9bef |
+ k12 = FakePackage('kernel', '1', '2', '0', 'i386')
|
|
|
5e9bef |
+ k13 = FakePackage('kernel', '1', '3', '0', 'i386')
|
|
|
5e9bef |
+ k14 = FakePackage('kernel', '1', '4', '0', 'i386')
|
|
|
5e9bef |
+ k15 = FakePackage('kernel', '1', '5', '0', 'i386')
|
|
|
5e9bef |
+
|
|
|
5e9bef |
+ res, msg = self.runOperation(['install', 'kernel-1-2'],
|
|
|
5e9bef |
+ [k11, k13, k14],
|
|
|
5e9bef |
+ [k11, k12, k13, k14, k15])
|
|
|
5e9bef |
+
|
|
|
5e9bef |
+ self.assert_(res=='ok', msg)
|
|
|
5e9bef |
+ self.assertResult((k11, k12, k13, k14))
|