[zypp-commit] r8632 - in /branches/tmp/ma/jump_sat/libzypp/zypp: Arch.h parser/susetags/PackagesFileReader.cc sat/Repo.cc sat/detail/PoolImpl.cc sat/detail/PoolImpl.h

Author: mlandres Date: Tue Feb 12 16:16:16 2008 New Revision: 8632 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8632&view=rev Log: filter unwanted architectures from pool Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Arch.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/PackagesFileReader.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Arch.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/Arch.h?rev=8632&r1=8631&r2=8632&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/Arch.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/Arch.h Tue Feb 12 16:16:16 2008 @@ -17,10 +17,12 @@ #include <set> #include <string> -#include "zypp/RelCompare.h" #include "zypp/base/String.h" #include "zypp/base/Iterator.h" +#include "zypp/IdStringType.h" +#include "zypp/RelCompare.h" + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -42,10 +44,13 @@ public: /** String representation of Arch. */ + IdString idStr() const + { return IdString( asString() ); } + /** \overload */ const std::string & asString() const; /** \overload */ - const std::string & string() const - { return asString(); } + const char * c_str() const + { return asString().c_str(); } /** Test for an empty Arch (this is "", not Arch_noarch). */ bool empty() const Modified: branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/PackagesFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/PackagesFileReader.cc?rev=8632&r1=8631&r2=8632&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/PackagesFileReader.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/PackagesFileReader.cc Tue Feb 12 16:16:16 2008 @@ -167,7 +167,7 @@ switch ( str::split( tag_r->value, std::back_inserter(words) ) ) { case 2: // [medianr filename] - _data->repositoryLocation.setLocation( Pathname(_data->arch.string()) / words[1], + _data->repositoryLocation.setLocation( Pathname(_data->arch.asString()) / words[1], str::strtonum<unsigned>(words[0]) ); break; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc?rev=8632&r1=8631&r2=8632&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc Tue Feb 12 16:16:16 2008 @@ -138,6 +138,8 @@ { ZYPP_THROW( Exception( _("Error reading solv-file: ")+file_r.asString() ) ); } + + } detail::SolvableIdType Repo::addSolvables( unsigned count_r ) Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc?rev=8632&r1=8631&r2=8632&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc Tue Feb 12 16:16:16 2008 @@ -12,13 +12,15 @@ #include <iostream> #include -#include "zypp/base/Logger.h" +#include "zypp/base/Easy.h" +#include "zypp/base/LogTools.h" #include "zypp/base/Gettext.h" #include "zypp/base/Exception.h" #include "zypp/ZConfig.h" #include "zypp/sat/detail/PoolImpl.h" +#include "zypp/sat/Repo.h" #include "zypp/Capability.h" using std::endl; @@ -113,7 +115,7 @@ ::pool_free( _pool ); } - /////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// void PoolImpl::setDirty( const char * a1, const char * a2, const char * a3 ) { @@ -136,6 +138,57 @@ } } + /////////////////////////////////////////////////////////////////// + + int PoolImpl::_addSolv( ::_Repo * repo_r, FILE * file_r ) + { + setDirty(__FUNCTION__, repo_r->name ); + int ret = ::repo_add_solv( repo_r , file_r ); + + if ( ret == 0 ) + { + // Filter out unwanted archs + std::setdetail::IdType sysids; + { + Arch::CompatSet sysarchs( Arch::compatSet( ZConfig::instance().systemArchitecture() ) ); + for_( it, sysarchs.begin(), sysarchs.end() ) + sysids.insert( it->idStr().id() ); + // unfortunately satsolver treats src/nosrc as architecture: + sysids.insert( ARCH_SRC ); + sysids.insert( ARCH_NOSRC ); + } + + detail::IdType blockBegin = 0; + unsigned blockSize = 0; + for ( detail::IdType i = repo_r->start; i < repo_r->end; ++i ) + { + ::_Solvable * s( _pool->solvables + i ); + if ( s->repo == repo_r && sysids.find( s->arch ) == sysids.end() ) + { + // Remember an unwanted arch entry: + if ( ! blockBegin ) + blockBegin = i; + ++blockSize; + } + else if ( blockSize ) + { + // Free remembered entries + ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false ); + blockBegin = blockSize = 0; + } + } + if ( blockSize ) + { + // Free remembered entries + ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false ); + blockBegin = blockSize = 0; + } + } + + return ret; + } + + ///////////////////////////////////////////////////////////////// } // namespace detail /////////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h?rev=8632&r1=8631&r2=8632&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h Tue Feb 12 16:16:16 2008 @@ -92,11 +92,8 @@ } /** Adding solv file to a repo. */ - int _addSolv( ::_Repo * repo_r, FILE * file_r ) - { - setDirty(__FUNCTION__, repo_r->name ); - return ::repo_add_solv( repo_r , file_r ); - } + int _addSolv( ::_Repo * repo_r, FILE * file_r ); + /** Adding Solvables to a repo. */ detail::SolvableIdType _addSolvables( ::_Repo * repo_r, unsigned count_r ) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org