Author: schubi2 Date: Tue Sep 4 12:08:57 2007 New Revision: 7103 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7103&view=rev Log: comparing vendor with VendorAttr::equivalent Modified: trunk/libzypp/zypp/solver/detail/Helper.cc trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: trunk/libzypp/zypp/solver/detail/Helper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Helper.cc?rev=7103&r1=7102&r2=7103&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/Helper.cc (original) +++ trunk/libzypp/zypp/solver/detail/Helper.cc Tue Sep 4 12:08:57 2007 @@ -27,7 +27,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/Gettext.h" - +#include "zypp/VendorAttr.h" #include "zypp/base/Algorithm.h" #include "zypp/ResPool.h" #include "zypp/ResFilters.h" @@ -134,7 +134,7 @@ if ( installed.resolvable() ) { - if ( installed->vendor() != provider->vendor() ) + if ( !VendorAttr::instance().equivalent(installed->vendor(),provider->vendor()) ) { MIL << "Discarding '" << provider << "' from vendor '" << provider->vendor() << "' different to uninstalled '" Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc?rev=7103&r1=7102&r2=7103&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original) +++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Tue Sep 4 12:08:57 2007 @@ -25,7 +25,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/Gettext.h" - +#include "zypp/VendorAttr.h" #include "zypp/base/Algorithm.h" #include "zypp/ResPool.h" #include "zypp/ResFilters.h" @@ -221,7 +221,7 @@ bool vendorFit = true; if ( provider && upgrades - && provider->vendor() != upgrades->vendor()) { + && !VendorAttr::instance().equivalent(provider->vendor(), upgrades->vendor())) { // checking if there is already an ignore MIL << "provider " << provider << " has ANOTHER vendor '" << provider->vendor() << "' than the updated item " << upgrades << endl; @@ -348,7 +348,7 @@ } else if (provider.status().isKept() && provider.status().isByUser()) { misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_KEEP_PROVIDER, requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match); misc_info->setOtherPoolItem (provider); - } else if (provider->vendor() != requirer->vendor()) { + } else if (!VendorAttr::instance().equivalent(provider->vendor(), requirer->vendor())) { misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_OTHER_VENDOR_PROVIDER, requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match); misc_info->setOtherPoolItem (provider); Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc?rev=7103&r1=7102&r2=7103&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Tue Sep 4 12:08:57 2007 @@ -42,7 +42,7 @@ #include "zypp/base/String.h" #include "zypp/base/Gettext.h" #include "zypp/base/Exception.h" - +#include "zypp/VendorAttr.h" #include "zypp/base/Algorithm.h" #include "zypp/ResPool.h" #include "zypp/ResStatus.h" @@ -213,7 +213,7 @@ bool operator()( const CapAndItem & cai ) { PoolItem provider( cai.item ); - if ( provider->vendor() != forItem->vendor() ) + if ( !VendorAttr::instance().equivalent(provider->vendor(), forItem->vendor()) ) { MIL << "Discarding '" << provider << "' from vendor '" << provider->vendor() << "' different to uninstalled '" @@ -361,7 +361,7 @@ continue; } - if ( installed->vendor() != candidate->vendor() ) + if ( !VendorAttr::instance().equivalent(installed->vendor(), candidate->vendor()) ) { MIL << "Discarding '" << candidate << "' from vendor '" << candidate->vendor() << "' different to uninstalled '" -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org