Author: matz Date: Sun Nov 25 10:58:16 2007 New Revision: 7913 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7913&view=rev Log: My Caps are only one kind, so let all others match too. Also fix thinko in matches(). Modified: branches/use-solv/libzypp/zypp/Capability.cc branches/use-solv/libzypp/zypp/Capability.h Modified: branches/use-solv/libzypp/zypp/Capability.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/Capabili... ============================================================================== --- branches/use-solv/libzypp/zypp/Capability.cc (original) +++ branches/use-solv/libzypp/zypp/Capability.cc Sun Nov 25 10:58:16 2007 @@ -92,7 +92,7 @@ { int f = rd2->flags == 5 ? 5 : rd2->flags == 2 ? rd1->flags : (rd2->flags ^ 5) & ( rd1->flags | 5); - if ((f & (1 << (1 + evrcmp (the_pool, rd2->evr, rd1->evr)))) != 0) + if ((f & (1 << (1 + evrcmp (the_pool, rd1->evr, rd2->evr)))) != 0) return CapMatch::yes; } } Modified: branches/use-solv/libzypp/zypp/Capability.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/Capabili... ============================================================================== --- branches/use-solv/libzypp/zypp/Capability.h (original) +++ branches/use-solv/libzypp/zypp/Capability.h Sun Nov 25 10:58:16 2007 @@ -151,7 +151,7 @@ template<class _Res> inline bool refersTo( const Capability & cap ) - { return cap.refers() == ResTraits<_Res>::kind; } + { return true; /*return cap.refers() == ResTraits<_Res>::kind;*/ } /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org