From 2f43dff585301b253e97d60b97b7ad5a1976cac9 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Mon, 28 Jul 2008 16:15:34 +0000 Subject: [PATCH] - Fixed SolvIterMixin::Selectable_iterator eating some solvables. --- package/libzypp.changes | 12 +++++++++--- zypp/sat/SolvIterMixin.cc | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index f4e3859..51f4460 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,7 +1,13 @@ ------------------------------------------------------------------- +Mon Jul 28 18:13:24 CEST 2008- ma@suse.de + +- Fixed SolvIterMixin::Selectable_iterator eating some solvables. +- revision 10680 + +------------------------------------------------------------------- Fri Jul 25 20:12:55 CEST 2008 - ma@suse.de -- Several changes to make libzypp-bindings compile using the original +- Several changes to make libzypp-bindings compile using the original header files and no private copies. (bnc #391831) - revision 10668 - version 5.3.0 @@ -22,10 +28,10 @@ Tue Jul 22 17:18:28 CEST 2008 - jkupec@suse.cz Thu Jul 17 09:49:40 CEST 2008 - schubi@suse.de - Allow parallel installation of packages which have been defined - in zypp.conf (parameter "multiversion") Fate #302050 + in zypp.conf (parameter "multiversion") Fate #302050 - Additional check for broken system. (defined in zypp.conv: solver.checkSystemFile) -- revision 10600 +- revision 10600 ------------------------------------------------------------------- Wed Jul 16 14:39:50 CEST 2008 - ma@suse.de diff --git a/zypp/sat/SolvIterMixin.cc b/zypp/sat/SolvIterMixin.cc index 7d2340a..a10ac53 100644 --- a/zypp/sat/SolvIterMixin.cc +++ b/zypp/sat/SolvIterMixin.cc @@ -15,6 +15,7 @@ #include "zypp/sat/SolvIterMixin.h" #include "zypp/sat/Solvable.h" #include "zypp/ResPoolProxy.h" +#include "zypp/pool/PoolTraits.h" using std::endl; @@ -29,7 +30,8 @@ namespace zypp { bool UnifyByIdent::operator()( const Solvable & solv_r ) const { - return( solv_r && _uset->insert( solv_r.ident().id() ).second ); + // Need to use pool::ByIdent because packages and srcpackages have the same id. + return( solv_r && _uset->insert( pool::ByIdent( solv_r ).get() ).second ); } } -- 2.7.4