[zypp-commit] r5627 - /trunk/libzypp-testsuite/solver/src/deptestomatic.cc

Author: schubi2 Date: Thu May 24 11:06:46 2007 New Revision: 5627 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5627&view=rev Log: parsing language dependencies correctly Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=5627&r1=5626&r2=5627&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Thu May 24 11:06:46 2007 @@ -532,12 +532,6 @@ bool operator()( PoolItem_Ref p) { -//MIL << p << " ?" << endl; - Source_Ref s = p->source(); - - if (s.alias() != source.alias()) { - return true; - } if (arch_set && arch != p->arch()) { // if arch requested, force this arch return true; } @@ -590,6 +584,14 @@ functor::functorRef (info) ); poolItem = info.poolItem; + if (!poolItem) { + // try to find the resolvable over all channel. This is useful for e.g. languages + invokeOnEach( God->pool().byNameBegin( package_name ), + God->pool().byNameEnd( package_name ), + resfilter::ByKind (kind), + functor::functorRef (info) ); + poolItem = info.poolItem; + } } catch (Exception & excpt_r) { ZYPP_CAUGHT (excpt_r); @@ -600,7 +602,7 @@ } if (!poolItem) { - cerr << "Can't find " << kind_name << ":'" << package_name << "' in source '" << source_alias << "': no such name/kind" << endl; + cerr << "Can't find kind: " << kind << ":'" << package_name << "' in source '" << source_alias << "': no such name/kind" << endl; } return poolItem; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org