[yum-cvs] cli.py

[Seth Vidal]

 cli.py |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 824e72a0cf1ef19c046ed4139a109173aa516e80
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Sep 6 15:27:16 2007 -0400

    if we're trying to localinstall a different arch and either the pkg we're
    installing or the one we have installed is a multilib pkg then it's okay to
    pass this package to be installed. Closed rh bug# 280491

diff --git a/cli.py b/cli.py
index 91e471f..1fc0594 100644
--- a/cli.py
+++ b/cli.py
@@ -33,6 +33,7 @@ import yum.misc
 import yum.plugins
 from yum.constants import TS_OBSOLETED
 import rpmUtils.arch
+from rpmUtils.arch import isMultiLibArch
 import rpmUtils.miscutils
 from yum.packages import parsePackages, YumLocalPackage
 from i18n import _
@@ -728,6 +729,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
                     else:
                         updatepkgs.append((po, installed_pkg))
                         continue
+                elif po.EVR == installed_pkg.EVR:
+                    if po.arch != installed_pkg.arch and (isMultiLibArch(po.arch) or
+                              isMultiLibArch(installed_pkg.arch)):
+                        installpkgs.append(po)
+                        continue
+                    else:
+                        donothingpkgs.append(po)
+                        continue
                 else:
                     donothingpkgs.append(po)
                     continue