no arch changes in not-updated list (bnc #646410)
authorJán Kupec <jkupec@suse.cz>
Tue, 19 Oct 2010 09:57:16 +0000 (11:57 +0200)
committerJán Kupec <jkupec@suse.cz>
Tue, 19 Oct 2010 09:57:16 +0000 (11:57 +0200)
src/Summary.cc

index 1f44177..95754f4 100644 (file)
@@ -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));
     }