[zypp-commit] r9921 - in /trunk/libzypp/zypp: sat/detail/PoolImpl.cc target/CommitLog.cc target/CommitLog.h target/TargetImpl.cc
Author: mlandres Date: Wed Apr 30 20:01:46 2008 New Revision: 9921 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9921&view=rev Log: small fixes Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc trunk/libzypp/zypp/target/CommitLog.cc trunk/libzypp/zypp/target/CommitLog.h trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl.cc?rev=9921&r1=9920&r2=9921&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Wed Apr 30 20:01:46 2008 @@ -351,6 +351,7 @@ case CapDetail::REL_NONE: case CapDetail::CAP_WITH: + case CapDetail::CAP_ARCH: break; // unwanted } } Modified: trunk/libzypp/zypp/target/CommitLog.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/CommitLog.cc?rev=9921&r1=9920&r2=9921&view=diff ============================================================================== --- trunk/libzypp/zypp/target/CommitLog.cc (original) +++ trunk/libzypp/zypp/target/CommitLog.cc Wed Apr 30 20:01:46 2008 @@ -15,6 +15,7 @@ #include "zypp/base/Logger.h" #include "zypp/target/CommitLog.h" +#include "zypp/PathInfo.h" #include "zypp/Date.h" using std::endl; @@ -65,9 +66,14 @@ if ( _refcnt ) closeLog(); _fname = fname_r; + if ( ! _fname.empty() ) + filesystem::assert_dir( _fname.dirname() ); if ( _refcnt ) openLog(); } + const Pathname & CommitLog::fname() + { return _fname; } + } // namespace target } // namespace zypp Modified: trunk/libzypp/zypp/target/CommitLog.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/CommitLog.h?rev=9921&r1=9920&r2=9921&view=diff ============================================================================== --- trunk/libzypp/zypp/target/CommitLog.h (original) +++ trunk/libzypp/zypp/target/CommitLog.h Wed Apr 30 20:01:46 2008 @@ -56,6 +56,7 @@ ~CommitLog() { refDown(); } std::ostream & operator()( bool timestamp = false ); static void setFname( const Pathname & fname_r ); + static const Pathname & fname(); }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.cc?rev=9921&r1=9920&r2=9921&view=diff ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Wed Apr 30 20:01:46 2008 @@ -58,8 +58,6 @@ using namespace zypp::resfilter; using zypp::solver::detail::Helper; -#define ZYPP_DB ( "/var/lib/zypp/db/" ) - /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -413,7 +411,6 @@ Pathname rpmsolv( Pathname::assertprefix( _root, ZConfig::instance().repoSolvfilesPath() / satpool.systemRepoName() / "solv" ) ); MIL << "adding " << rpmsolv << " to pool(" << satpool.systemRepoName() << ")" << endl; -#warning PROBABLY CLEAR NONEMTY SYSTEM REPO // Providing an empty system repo, unload any old content Repository system( sat::Pool::instance().findSystemRepo() ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org
participants (1)
-
mlandres@svn.opensuse.org