From 0e278a520c69d40521b5f00c005202405e11772e Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Thu, 11 Jul 2013 11:59:28 +0200 Subject: [PATCH] Fix multiversion update candidate to respect an installed objects arch and vendor (bnc#820444) --- zypp/ui/SelectableImpl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 6ce3fc59c..0f2dfb8f7 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -145,8 +145,8 @@ namespace zypp { PoolItem defaultCand( defaultCandidate() ); - if ( multiversionInstall() ) - return identicalInstalled( defaultCand ) ? PoolItem() : defaultCand; + // multiversionInstall: This returns the candidate for the last + // instance installed. Actually we'd need a list here. if ( installedEmpty() || ! defaultCand ) return defaultCand; @@ -363,7 +363,7 @@ namespace zypp PoolItem defaultCandidate() const { - if ( ! ( multiversionInstall() || installedEmpty() ) ) + if ( ! installedEmpty() ) { // prefer the installed objects arch and vendor bool solver_allowVendorChange( ResPool::instance().resolver().allowVendorChange() ); -- 2.34.1