Author: jkupec Date: Fri Apr 11 19:13:05 2008 New Revision: 9552 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9552&view=rev Log: - not needed anymore, seems like the bug was here, but switching to LookupAttr::iterator made it go away Modified: trunk/libzypp/zypp/PoolQuery.cc Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=9552&r1=9551&r2=9552&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Fri Apr 11 19:13:05 2008 @@ -581,15 +581,11 @@ bool new_solvable = true; bool matches = !_do_matching; - bool in_repo; bool drop_by_kind_status = false; bool drop_by_repo = false; do { - //! \todo FIXME Dataiterator returning resolvables belonging to current repo? - in_repo = _sid >= base().get()->repo->start; - - if (in_repo && new_solvable) + if (new_solvable) { while(1) { @@ -636,7 +632,7 @@ if (_do_matching && !drop_by_kind_status) { - if (!matches && in_repo) + if (!matches) { SolvAttr attr(base().get()->key->name); PoolQuery::CompiledAttrMap::const_iterator ai = _pqimpl->_rcattrs.find(attr); @@ -699,14 +695,12 @@ // thus resulting to a problem in the equal() method ++base_reference(); new_solvable = base().get()->solvid != _sid; - if (!in_repo) - _sid = base().get()->solvid; } // no more attributes in this repo, return else - return matches && in_repo; // did the last solvable match conditions? + return matches; // did the last solvable match conditions? } - while (!new_solvable || !in_repo); + while (!new_solvable); return matches; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org