From: Ján Kupec <jkupec@suse.cz>
Date: Tue, 19 Oct 2010 09:57:16 +0000 (+0200)
Subject: no arch changes in not-updated list (bnc #646410)
X-Git-Tag: 1.5.1~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f4801ecee4ab9a7119970b60fd03f1821b8a8d4;p=platform%2Fupstream%2Fzypper.git

no arch changes in not-updated list (bnc #646410)
---

diff --git a/src/Summary.cc b/src/Summary.cc
index 1f44177..95754f4 100644
--- a/src/Summary.cc
+++ b/src/Summary.cc
@@ -252,6 +252,11 @@ void Summary::readPool(const zypp::ResPool & pool)
         continue;
       if (compareByNVRA((*it)->installedObj().resolvable(), candidate) >= 0)
         continue;
+      // ignore higher versions with different arch (except noarch) bnc #646410
+      if ((*it)->installedObj()->arch() != candidate->arch()
+          && (*it)->installedObj()->arch() != Arch_noarch
+          && candidate->arch() != Arch_noarch)
+        continue;
 
       candidates[*kit].insert(ResPair(nullres, candidate));
     }