From c76734ddc44413bdb1def86863c2d9a0f55347a9 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 13 Jan 2006 09:57:44 +0000 Subject: [PATCH] checking name of version capabilities --- zypp/capability/CapabilityImpl.h | 3 +++ zypp/capability/VersionedCap.cc | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/zypp/capability/CapabilityImpl.h b/zypp/capability/CapabilityImpl.h index ed64270..5b05606 100644 --- a/zypp/capability/CapabilityImpl.h +++ b/zypp/capability/CapabilityImpl.h @@ -84,6 +84,9 @@ namespace zypp virtual Edition::Range editionRange() const { return Edition::Range(); } + bool sameIndex( const constPtr & rhs ) const + { return index() == rhs->index(); } + bool sameKind( const constPtr & rhs ) const { return kind() == rhs->kind(); } diff --git a/zypp/capability/VersionedCap.cc b/zypp/capability/VersionedCap.cc index 2b43ae0..17c3171 100644 --- a/zypp/capability/VersionedCap.cc +++ b/zypp/capability/VersionedCap.cc @@ -35,7 +35,8 @@ namespace zypp CapMatch VersionedCap::matches( const constPtr & rhs ) const { if ( sameRefers( rhs ) - && ( sameKind( rhs ) || isKind( rhs ) ) ) + && ( sameKind( rhs ) || isKind( rhs ) ) + && sameIndex( rhs )) { return matchEditionRange( rhs ); } -- 2.7.4