[zypp-commit] r9605 - in /trunk/libzypp: package/libzypp.changes zypp/sat/detail/PoolImpl.cc

Author: mlandres Date: Mon Apr 14 12:54:05 2008 New Revision: 9605 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9605&view=rev Log: Enable evaluation of filesystem dependencies Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/sat/detail/PoolImpl.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=9605&r1=9604&r2=9605&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Apr 14 12:54:05 2008 @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Mon Apr 14 12:01:13 CEST 2008 - ma@suse.de +Mon Apr 14 12:53:09 CEST 2008 - ma@suse.de - Enable evaluation of hardware dependencies. -- revision 9603 +- Enable evaluation of filesystem dependencies. +- revision 9605 ------------------------------------------------------------------- Sun Apr 13 02:17:25 CEST 2008 - jkupec@suse.cz Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl.cc?rev=9605&r1=9604&r2=9605&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Mon Apr 14 12:54:05 2008 @@ -17,6 +17,8 @@ #include "zypp/base/Gettext.h" #include "zypp/base/Exception.h" #include "zypp/base/Measure.h" +#include "zypp/base/WatchFile.h" +#include "zypp/base/Sysconfig.h" #include "zypp/ZConfig.h" @@ -38,6 +40,9 @@ /////////////////////////////////////////////////////////////////// namespace sat { ///////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////// namespace detail { ///////////////////////////////////////////////////////////////// @@ -84,7 +89,7 @@ case NAMESPACE_LANGUAGE: { const std::tr1::unordered_set<IdString> & locale2Solver( reinterpret_cast(data)->_locale2Solver ); - return locale2Solver.find( IdString(rhs) ) == locale2Solver.end() ? RET_unsupported : RET_systemProperty; + return locale2Solver.find( IdString(rhs) ) != locale2Solver.end() ? RET_systemProperty : RET_unsupported; } break; @@ -96,7 +101,16 @@ case NAMESPACE_FILESYSTEM: { - + static const Pathname sysconfigStoragePath( "/etc/sysconfig/storage" ); + static WatchFile sysconfigFile( sysconfigStoragePath, WatchFile::NO_INIT ); + static std::setstd::string requiredFilesystems; + if ( sysconfigFile.hasChanged() ) + { + requiredFilesystems.clear(); + str::split( base::sysconfig::read( sysconfigStoragePath )["USED_FS_LIST"], + std::inserter( requiredFilesystems, requiredFilesystems.end() ) ); + } + return requiredFilesystems.find( IdString(rhs).asString() ) != requiredFilesystems.end() ? RET_systemProperty : RET_unsupported; } break; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org