Merge pull request rpm-software-management#69 from dmnks/bz1477574

update(): honor multilib_policy for obsoletes

Author: dmnks

test/simpleobsoletestests.py

@@ -38,7 +38,8 @@ def testObsoletenoarchTonoarchForDependency(self):
 
     def testObsoletenoarchToi386(self):
         p = self.pkgs
-        res, msg = self.runOperation(['update'], [p.installed_noarch], [p.obsoletes_i386])
+        res, msg = self.runOperation(['update'], [p.installed_noarch], [p.obsoletes_i386],
+                                     {'multilib_policy': 'all'})
         self.assert_(res=='ok', msg)
         self.assertResult((p.obsoletes_i386,))
     def testObsoletenoarchToi386ForDependency(self):
@@ -50,7 +51,8 @@ def testObsoletenoarchToi386ForDependency(self):
 
     def testObsoletenoarchTox86_64(self):
         p = self.pkgs
-        res, msg = self.runOperation(['update'], [p.installed_noarch], [p.obsoletes_x86_64])
+        res, msg = self.runOperation(['update'], [p.installed_noarch], [p.obsoletes_x86_64],
+                                     {'multilib_policy': 'all'})
         self.assert_(res=='ok', msg)
         self.assertResult((p.obsoletes_x86_64,))
     def testObsoletenoarchTox86_64ForDependency(self):
@@ -62,7 +64,8 @@ def testObsoletenoarchTox86_64ForDependency(self):
 
     def testObsoletenoarchToMultiarch(self):
         p = self.pkgs
-        res, msg = self.runOperation(['update'], [p.installed_noarch], [p.obsoletes_i386, p.obsoletes_x86_64])
+        res, msg = self.runOperation(['update'], [p.installed_noarch], [p.obsoletes_i386, p.obsoletes_x86_64],
+                                     {'multilib_policy': 'all'})
         self.assert_(res=='ok', msg)
         if new_behavior:
             self.assertResult((p.obsoletes_x86_64,), (p.obsoletes_i386,))

yum/__init__.py

@@ -4789,6 +4789,21 @@ def _valid_install_arch(self, po, ipkgs=None):
             return False
         return True
 
+    def _valid_obsoleter_arch(self, obsoleter, obsoletee):
+        """Return whether this obsoleter meets multilib_policy in case we are
+        dealing with the noarch->arch obsoletion case."""
+        if not self.arch.multilib or self.conf.multilib_policy != 'best':
+            # Install everything
+            return True
+        if obsoletee.arch != 'noarch' or obsoleter.arch == 'noarch':
+            # We do respect any arch->(no)arch obsoletions (having
+            # obsoletee.i386 installed on x86_64, you'd still expect
+            # obsoleter.i386 to replace it, even if you have
+            # multilib_policy=best).
+            return True
+        # noarch->arch case
+        return obsoleter.arch in self.arch.legit_multi_arches
+
     def install(self, po=None, **kwargs):
         """Mark the specified item for installation.  If a package
         object is given, mark it for installation.  Otherwise, mark
@@ -5156,10 +5171,12 @@ def _dbg2(*args, **kwargs):
                                                        allow_missing=True)
                 if obsoleting_pkg is None:
                     continue
+                installed_pkg =  self.getInstalledPackageObject(installed)
+                if not self._valid_obsoleter_arch(obsoleting_pkg, installed_pkg):
+                    continue
                 topkg = self._test_loop(obsoleting_pkg, self._pkg2obspkg)
                 if topkg is not None:
                     obsoleting_pkg = topkg
-                installed_pkg =  self.getInstalledPackageObject(installed)
                 txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
                 self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
                 if requiringPo:
@@ -5193,6 +5210,7 @@ def _dbg2(*args, **kwargs):
 
         instpkgs = []
         availpkgs = []
+        arch_specified = True
         if po: # just a po
             if po.repoid == 'installed':
                 instpkgs.append(po)
@@ -5254,6 +5272,8 @@ def _dbg2(*args, **kwargs):
                 self.logger.critical(_('No Match for argument: %s') % to_unicode(arg))
                 if not self.conf.skip_missing_names_on_update:
                     raise Errors.UpdateMissingNameError, _('Not tolerating missing names on update, stopping.')
+
+            arch_specified = '.' in kwargs['pattern']
 
         else: # we have kwargs, sort them out.
             nevra_dict = self._nevra_kwarg_parse(kwargs)
@@ -5306,12 +5326,16 @@ def _dbg2(*args, **kwargs):
                                                            allow_missing=True)
                     if obsoleting_pkg is None:
                         continue
+                    if not arch_specified and not self._valid_obsoleter_arch(obsoleting_pkg, installed_pkg):
+                        continue
                     obs_pkgs.append(obsoleting_pkg)
                 # NOTE: Broekn wrt. repoid
                 for obsoleting_pkg in packagesNewestByName(obs_pkgs):
                     tx_return.extend(self.install(po=obsoleting_pkg))
             for available_pkg in availpkgs:
                 for obsoleted_pkg in self._find_obsoletees(available_pkg):
+                    if not arch_specified and not self._valid_obsoleter_arch(available_pkg, obsoleted_pkg):
+                        continue
                     obsoleted = obsoleted_pkg.pkgtup
                     txmbr = self.tsInfo.addObsoleting(available_pkg, obsoleted_pkg)
                     if requiringPo: