Author: schubi2 Date: Thu Mar 6 13:14:23 2008 New Revision: 9028 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9028&view=rev Log: set architecture before generating whatprovides #367684 Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl.cc?rev=9028&r1=9027&r2=9028&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Thu Mar 6 13:14:23 2008 @@ -154,6 +154,8 @@ if ( _watcher.remember( _serial ) ) { /* nothing to do here, but _watcher MUST remember... */ + // set pool architecture + ::pool_setarch( _pool, ZConfig::instance().systemArchitecture().asString().c_str() ); } if ( ! _pool->whatprovides ) { @@ -176,7 +178,8 @@ { Arch::CompatSet sysarchs( Arch::compatSet( ZConfig::instance().systemArchitecture() ) ); for_( it, sysarchs.begin(), sysarchs.end() ) - sysids.insert( it->idStr().id() ); + sysids.insert( it->idStr().id() ); + // unfortunately satsolver treats src/nosrc as architecture: sysids.insert( ARCH_SRC ); sysids.insert( ARCH_NOSRC ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org