April 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r9928 - /trunk/libzypp-bindings/swig/zypp.i
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Thu May 1 01:58:56 2008 New Revision: 9928 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9928&view=rev Log: hack to compile ruby Modified: trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Thu May 1 01:58:56 2008 @@ -12,6 +12,13 @@ %{ /* Includes the header in the wrapper code */ +#ifdef SWIGRUBY +#define REG_EXTENDED 1 +#define REG_ICASE (REG_EXTENDED << 1) +#define REG_NEWLINE (REG_ICASE << 1) +#define REG_NOSUB (REG_NEWLINE << 1) +#endif + #include <sstream> #include "zypp/base/PtrTypes.h" #include "zypp/Edition.h" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9927 - in /trunk/libzypp: ./ devel/devel.ma/ package/ zypp/ zypp/target/ zypp/zypp_detail/
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Thu May 1 01:07:34 2008 New Revision: 9927 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9927&view=rev Log: - Load and maintain persistent hard locks stored in /etc/zypp/locks. Locks are loaded together with the target, and changes are writen back on commit. zypp.conf option locksfile.apply can be used to turn this feature on or off. (FATE #120352) Added: trunk/libzypp/zypp/target/HardLocksFile.cc trunk/libzypp/zypp/target/HardLocksFile.h Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/ResPool.cc trunk/libzypp/zypp/ResPool.h trunk/libzypp/zypp/ZYpp.cc trunk/libzypp/zypp/ZYpp.h trunk/libzypp/zypp/target/SoftLocksFile.h trunk/libzypp/zypp/target/TargetImpl.cc trunk/libzypp/zypp/target/TargetImpl.h trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc trunk/libzypp/zypp/zypp_detail/ZYppImpl.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=9927&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu May 1 01:07:34 2008 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "4") -SET(LIBZYPP_MINOR "17") -SET(LIBZYPP_COMPATMINOR "17") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_MINOR "18") +SET(LIBZYPP_COMPATMINOR "18") +SET(LIBZYPP_PATCH "0") Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Thu May 1 01:07:34 2008 @@ -474,13 +474,17 @@ { ResPool pool( ResPool::instance() ); ostream & outs( SEC ); + unsigned cnt = 0; outs << t << ": {" << endl; for_( it, pool.begin(), pool.end() ) { if ( it->status().isLocked() ) + { outs << " " << *it << endl; + ++cnt; + } } - outs << '}' << endl; + outs << '}' << cnt << endl; } void ssup() @@ -503,6 +507,15 @@ dumpRange( DBG, q.begin(), q.end() ) << endl; newLocks.push_back( q ); } + { + PoolQuery q; + q.addAttribute( sat::SolvAttr::name, "amarok" ); + q.addKind( ResKind::package ); + q.setMatchExact(); + q.setCaseSensitive(true); + dumpRange( DBG, q.begin(), q.end() ) << endl; + newLocks.push_back( q ); + } pool.setHardLockQueries( newLocks ); @@ -525,9 +538,6 @@ ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); - ssup(); - //sslk( "START" ); - if ( 1 ) { RepoManager repoManager( makeRepoManager( sysRoot ) ); @@ -582,8 +592,6 @@ } USR << "pool: " << pool << endl; - - sslk( nrepo.alias() ); } } } @@ -597,7 +605,6 @@ getZYpp()->initializeTarget( sysRoot ); } getZYpp()->target()->load(); - sslk( "TARGET" ); } } @@ -615,32 +622,14 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - INT << "===[END]============================================" << endl << endl; - zypp::base::LogControl::instance().logNothing(); - return 0; - //ResPool pool( ResPool::instance() ); - - // - PoolQueryResult result( pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ); - MIL << result.size() << endl; - - { - PoolQuery q; - q.addAttribute( sat::SolvAttr::name, "[a-zA-Z]*" ); - q.setMatchGlob(); - result -= q; - MIL << result.size() << endl; - } - MIL << result << endl; - - sat::WhatProvides poviders( Capability("3ddiag") ); - result -= PoolQueryResult( poviders.begin(), poviders.end() ); - MIL << result << endl; + //ssup(); + //sslk("X"); + ResPool::HardLockQueries newLocks; + pool.getHardLockQueries( newLocks ); + SEC << newLocks << endl; - result -= result; - MIL << result << endl; + install(); /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu May 1 01:07:34 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu May 1 00:50:51 CEST 2008 - ma(a)suse.de + +- Load and maintain persistent hard locks stored in /etc/zypp/locks. + Locks are loaded together with the target, and changes are writen + back on commit. zypp.conf option locksfile.apply can be used to turn + this feature on or off. (FATE #120352) +- version 4.18.0 +- revision 9927 + +------------------------------------------------------------------- Wed Apr 30 16:27:49 CEST 2008 - ma(a)suse.de - Add zypp.conf option solvfilesdir: Path where the repo solv files Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Thu May 1 01:07:34 2008 @@ -564,6 +564,7 @@ SET( zypp_target_SRCS target/RequestedLocalesFile.cc target/SoftLocksFile.cc + target/HardLocksFile.cc target/CommitLog.cc target/CommitPackageCache.cc target/CommitPackageCacheImpl.cc @@ -576,6 +577,7 @@ SET( zypp_target_HEADERS target/RequestedLocalesFile.h target/SoftLocksFile.h + target/HardLocksFile.h target/CommitLog.h target/CommitPackageCache.h target/CommitPackageCacheImpl.h Modified: trunk/libzypp/zypp/ResPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResPool.cc?rev=9927… ============================================================================== --- trunk/libzypp/zypp/ResPool.cc (original) +++ trunk/libzypp/zypp/ResPool.cc Thu May 1 01:07:34 2008 @@ -111,8 +111,8 @@ void ResPool::setHardLockQueries( const HardLockQueries & newLocks_r ) { _pimpl->setHardLockQueries( newLocks_r ); } - bool ResPool::getHardLockQueries( HardLockQueries & activeLocks_r ) - { return _pimpl->getHardLockQueries( activeLocks_r ); } + void ResPool::getHardLockQueries( HardLockQueries & activeLocks_r ) + { _pimpl->getHardLockQueries( activeLocks_r ); } const pool::PoolTraits::ItemContainerT & ResPool::store() const Modified: trunk/libzypp/zypp/ResPool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResPool.h?rev=9927&… ============================================================================== --- trunk/libzypp/zypp/ResPool.h (original) +++ trunk/libzypp/zypp/ResPool.h Thu May 1 01:07:34 2008 @@ -357,11 +357,9 @@ void setHardLockQueries( const HardLockQueries & newLocks_r ); /** Suggest a new set of queries based on the current selection. - * (usually remembered on commit). Returns whether the sugested - * set differs from the one that was previously set via - * \ref setHardLockQueries. + * (usually remembered on commit). */ - bool getHardLockQueries( HardLockQueries & activeLocks_r ); + void getHardLockQueries( HardLockQueries & activeLocks_r ); //@} private: Modified: trunk/libzypp/zypp/ZYpp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYpp.cc?rev=9927&r1… ============================================================================== --- trunk/libzypp/zypp/ZYpp.cc (original) +++ trunk/libzypp/zypp/ZYpp.cc Thu May 1 01:07:34 2008 @@ -118,8 +118,6 @@ void ZYpp::setHomePath( const Pathname & path ) { _pimpl->setHomePath(path); } - int ZYpp::applyLocks() - { return _pimpl->applyLocks(); } ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/ZYpp.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYpp.h?rev=9927&r1=… ============================================================================== --- trunk/libzypp/zypp/ZYpp.h (original) +++ trunk/libzypp/zypp/ZYpp.h Thu May 1 01:07:34 2008 @@ -180,12 +180,11 @@ public: /** - * \short Apply persistant locks to current pool. - * Call this before solving - * - * \returns Number of items locked + * \deprecated Persistent locks are automatically maintained, kept in the pool, loaded and saved together with the Target. + * \ref ZConfig::apply_locks_file tells whether locks are applied or not. */ - int applyLocks(); + ZYPP_DEPRECATED int applyLocks() + { return 0; } protected: /** Dtor */ Added: trunk/libzypp/zypp/target/HardLocksFile.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/HardLocksFil… ============================================================================== --- trunk/libzypp/zypp/target/HardLocksFile.cc (added) +++ trunk/libzypp/zypp/target/HardLocksFile.cc Thu May 1 01:07:34 2008 @@ -0,0 +1,87 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/target/HardLocksFile.cc + * +*/ +#include <iostream> +#include <fstream> + +#include "zypp/base/LogTools.h" +#include "zypp/base/IOStream.h" +#include "zypp/base/String.h" + +#include "zypp/PathInfo.h" +#include "zypp/TmpPath.h" +#include "zypp/Date.h" + +#include "zypp/target/HardLocksFile.h" +#include "zypp/PoolQueryUtil.tcc" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace target + { ///////////////////////////////////////////////////////////////// + + void HardLocksFile::load( const Pathname & file_r, Data & data_r ) + { + PathInfo pi( file_r ); + if ( ! pi.isFile() ) + { + WAR << "Can't read " << pi << endl; + return; + } + + readPoolQueriesFromFile( file_r, std::back_inserter( data_r ) ); + + MIL << "Read " << pi << endl; + } + + void HardLocksFile::store( const Pathname & file_r, const Data & data_r ) + { + filesystem::TmpFile tmp( filesystem::TmpFile::makeSibling( file_r ) ); + filesystem::chmod( tmp.path(), 0644 ); + + writePoolQueriesToFile( tmp.path(), data_r.begin(), data_r.end() ); + + if ( true ) // by now: no error info from writePoolQueriesToFile + { + filesystem::rename( tmp.path(), file_r ); + MIL << "Wrote " << PathInfo(file_r) << endl; + } + else + { + ERR << "Can't write " << PathInfo(tmp.path()) << endl; + } + } + + /****************************************************************** + ** + ** FUNCTION NAME : operator<< + ** FUNCTION TYPE : std::ostream & + */ + std::ostream & operator<<( std::ostream & str, const HardLocksFile & obj ) + { + str << obj.file() << ' '; + if ( obj._dataPtr ) + str << obj.data(); + else + str << "(unloaded)"; + return str; + } + + ///////////////////////////////////////////////////////////////// + } // namespace target + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/target/HardLocksFile.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/HardLocksFil… ============================================================================== --- trunk/libzypp/zypp/target/HardLocksFile.h (added) +++ trunk/libzypp/zypp/target/HardLocksFile.h Thu May 1 01:07:34 2008 @@ -0,0 +1,122 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/target/HardLocksFile.h + * +*/ +#ifndef ZYPP_TARGET_HARDLOCKSFILE_H +#define ZYPP_TARGET_HARDLOCKSFILE_H + +#include <iosfwd> + +#include "zypp/base/PtrTypes.h" + +#include "zypp/Pathname.h" +#include "zypp/pool/PoolTraits.h" +#include "zypp/PoolQuery.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace target + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : HardLocksFile + // + /** Save and restore hardlocks. + */ + class HardLocksFile + { + friend std::ostream & operator<<( std::ostream & str, const HardLocksFile & obj ); + public: + + typedef pool::PoolTraits::HardLockQueries Data; + + public: + /** Ctor taking the file to read/write. */ + HardLocksFile( const Pathname & file_r ) + : _file( file_r ) + {} + + /** Return the file path. */ + const Pathname & file() const + { return _file; } + + /** Return the data. + * The file is read once on demand. Returns empty \ref Data if + * the file does not exist or is not readable. + */ + const Data & data() const + { + if ( !_dataPtr ) + { + _dataPtr.reset( new Data ); + Data & mydata( *_dataPtr ); + load( _file, mydata ); + } + return *_dataPtr; + } + + /** Store new \ref Data. + * Write the new \ref Data to file, unless we know it + * did not change. The directory containing file must + * exist. + */ + void setData( const Data & data_r ) + { + if ( !_dataPtr ) + _dataPtr.reset( new Data ); + + if ( differs( *_dataPtr, data_r ) ) + { + store( _file, data_r ); + *_dataPtr = data_r; + } + } + + private: + /** Helper testing whether two \ref Data differ. */ + bool differs( const Data & lhs, const Data & rhs ) const + { + if ( lhs.size() != rhs.size() ) + return true; + // Complete diff is too expensive and not necessary here. + // Just check for the same sequence of items. + Data::const_iterator rit = rhs.begin(); + for_( it, lhs.begin(), lhs.end() ) + { + if ( *it != *rit ) + return true; + ++rit; + } + return false; + } + /** Read \ref Data from \c file_r. */ + static void load( const Pathname & file_r, Data & data_r ); + /** Write \ref Data to \c file_r. */ + static void store( const Pathname & file_r, const Data & data_r ); + + private: + Pathname _file; + mutable scoped_ptr<Data> _dataPtr; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates HardLocksFile Stream output */ + std::ostream & operator<<( std::ostream & str, const HardLocksFile & obj ); + + ///////////////////////////////////////////////////////////////// + } // namespace target + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_TARGET_HARDLOCKSFILE_H Modified: trunk/libzypp/zypp/target/SoftLocksFile.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/SoftLocksFil… ============================================================================== --- trunk/libzypp/zypp/target/SoftLocksFile.h (original) +++ trunk/libzypp/zypp/target/SoftLocksFile.h Thu May 1 01:07:34 2008 @@ -16,8 +16,8 @@ #include "zypp/base/PtrTypes.h" +#include "zypp/IdString.h" #include "zypp/Pathname.h" -#include "zypp/Locale.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -30,7 +30,7 @@ // // CLASS NAME : SoftLocksFile // - /** Save and restore locale set from file. + /** Save and restore soft locks. */ class SoftLocksFile { Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Thu May 1 01:07:34 2008 @@ -282,6 +282,7 @@ : _root( root_r ) , _requestedLocalesFile( home() / "RequestedLocales" ) , _softLocksFile( home() / "SoftLocks" ) + , _hardLocksFile( Pathname::assertprefix( _root, ZConfig::instance().locksFile() ) ) { _rpm.initDatabase( root_r, Pathname(), doRebuild_r ); MIL << "Initialized target on " << _root << endl; @@ -442,16 +443,27 @@ // to avoid undoing changes the application applied. We expect this // to happen on a bare metal installation only. An already existing // target should be loaded before its settings are changed. - const LocaleSet & requestedLocales( _requestedLocalesFile.locales() ); - if ( ! requestedLocales.empty() ) { - satpool.setRequestedLocales( requestedLocales ); + const LocaleSet & requestedLocales( _requestedLocalesFile.locales() ); + if ( ! requestedLocales.empty() ) + { + satpool.setRequestedLocales( requestedLocales ); + } } - - const SoftLocksFile::Data & softLocks( _softLocksFile.data() ); - if ( ! softLocks.empty() ) { - ResPool::instance().setAutoSoftLocks( softLocks ); + const SoftLocksFile::Data & softLocks( _softLocksFile.data() ); + if ( ! softLocks.empty() ) + { + ResPool::instance().setAutoSoftLocks( softLocks ); + } + } + if ( ZConfig::instance().apply_locks_file() ) + { + const HardLocksFile::Data & hardLocks( _hardLocksFile.data() ); + if ( ! hardLocks.empty() ) + { + ResPool::instance().setHardLockQueries( hardLocks ); + } } @@ -478,6 +490,12 @@ pool_r.getActiveSoftLocks( newdata ); _softLocksFile.setData( newdata ); } + if ( ZConfig::instance().apply_locks_file() ) + { + HardLocksFile::Data newdata; + pool_r.getHardLockQueries( newdata ); + _hardLocksFile.setData( newdata ); + } // Process packages: ZYppCommitResult result; Modified: trunk/libzypp/zypp/target/TargetImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.h… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.h (original) +++ trunk/libzypp/zypp/target/TargetImpl.h Thu May 1 01:07:34 2008 @@ -30,6 +30,7 @@ #include "zypp/target/TargetException.h" #include "zypp/target/RequestedLocalesFile.h" #include "zypp/target/SoftLocksFile.h" +#include "zypp/target/HardLocksFile.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -154,6 +155,8 @@ RequestedLocalesFile _requestedLocalesFile; /** Soft-locks database */ SoftLocksFile _softLocksFile; + /** Hard-Locks database */ + HardLocksFile _hardLocksFile; private: /** Null implementation */ static TargetImpl_Ptr _nullimpl; Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImp… ============================================================================== --- trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc (original) +++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Thu May 1 01:07:34 2008 @@ -22,7 +22,6 @@ #include "zypp/NVRAD.h" #include "zypp/DiskUsageCounter.h" #include "zypp/NameKindProxy.h" -#include "zypp/Locks.h" #include "zypp/ZConfig.h" #include "zypp/sat/Pool.h" #include "zypp/PoolItem.h" @@ -177,27 +176,6 @@ return zypp_tmp_dir.path(); } - int ZYppImpl::applyLocks() - { - if (!ZConfig::instance().apply_locks_file()) - return 0; - - //TODO catch posibble exceptions - Locks::instance().readAndApply(); - - //current locks api doesn't support counting locked solvables - //so count it after - int count = 0; - for_(it, sat::Pool::instance().solvablesBegin(), - sat::Pool::instance().solvablesEnd()) - { - PoolItem i(*it); - if ( i.status().isLocked() ) - count++; - } - - return count; - } /****************************************************************** ** ** FUNCTION NAME : operator<< Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImp… ============================================================================== --- trunk/libzypp/zypp/zypp_detail/ZYppImpl.h (original) +++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.h Thu May 1 01:07:34 2008 @@ -101,10 +101,6 @@ void setPartitions(const DiskUsageCounter::MountPointSet &mp); DiskUsageCounter::MountPointSet getPartitions() const; - public: - - int applyLocks(); - private: /** */ Target_Ptr _target; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9926 - /trunk/libzypp/zypp/PoolQueryUtil.tcc
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Thu May 1 00:36:11 2008 New Revision: 9926 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9926&view=rev Log: Define functions in namespace zypp Modified: trunk/libzypp/zypp/PoolQueryUtil.tcc Modified: trunk/libzypp/zypp/PoolQueryUtil.tcc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryUtil.tcc?r… ============================================================================== --- trunk/libzypp/zypp/PoolQueryUtil.tcc (original) +++ trunk/libzypp/zypp/PoolQueryUtil.tcc Thu May 1 00:36:11 2008 @@ -19,6 +19,9 @@ #include "zypp/Pathname.h" #include "zypp/PoolQuery.h" +namespace zypp +{ + /** * sends to output iterator all queries readed from file. * @@ -70,4 +73,5 @@ fout.close(); } +} #endif // ZYPP_POOLQUERYUTIL_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9925 - /trunk/libzypp/zypp/Capability.cc
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Thu May 1 00:35:22 2008 New Revision: 9925 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9925&view=rev Log: fix missing enum in switch Modified: trunk/libzypp/zypp/Capability.cc Modified: trunk/libzypp/zypp/Capability.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Capability.cc?rev=9… ============================================================================== --- trunk/libzypp/zypp/Capability.cc (original) +++ trunk/libzypp/zypp/Capability.cc Thu May 1 00:35:22 2008 @@ -358,6 +358,7 @@ case CapDetail::CAP_AND: case CapDetail::CAP_OR: case CapDetail::CAP_WITH: + case CapDetail::CAP_ARCH: return str << obj.lhs().detail() << " " << obj.capRel() << " " << obj.rhs().detail(); break; case CapDetail::CAP_NAMESPACE: @@ -389,6 +390,7 @@ case CapDetail::CAP_OR: return str << "OR"; break; case CapDetail::CAP_WITH: return str << "WITH"; break; case CapDetail::CAP_NAMESPACE: return str << "NAMESPACE"; break; + case CapDetail::CAP_ARCH: return str << "ARCH"; break; } return str << "UnknownCapRel"; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9924 - in /trunk/libzypp/zypp: ResPool.cc ResPool.h ResStatus.cc pool/PoolImpl.h
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Wed Apr 30 23:20:45 2008 New Revision: 9924 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9924&view=rev Log: Enabled Pool to handle persistent hard locks, except save/restore which is Targets job. Modified: trunk/libzypp/zypp/ResPool.cc trunk/libzypp/zypp/ResPool.h trunk/libzypp/zypp/ResStatus.cc trunk/libzypp/zypp/pool/PoolImpl.h Modified: trunk/libzypp/zypp/ResPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResPool.cc?rev=9924… ============================================================================== --- trunk/libzypp/zypp/ResPool.cc (original) +++ trunk/libzypp/zypp/ResPool.cc Wed Apr 30 23:20:45 2008 @@ -111,8 +111,8 @@ void ResPool::setHardLockQueries( const HardLockQueries & newLocks_r ) { _pimpl->setHardLockQueries( newLocks_r ); } - void ResPool::getHardLockQueries( HardLockQueries & activeLocks_r ) - { _pimpl->getHardLockQueries( activeLocks_r ); } + bool ResPool::getHardLockQueries( HardLockQueries & activeLocks_r ) + { return _pimpl->getHardLockQueries( activeLocks_r ); } const pool::PoolTraits::ItemContainerT & ResPool::store() const Modified: trunk/libzypp/zypp/ResPool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResPool.h?rev=9924&… ============================================================================== --- trunk/libzypp/zypp/ResPool.h (original) +++ trunk/libzypp/zypp/ResPool.h Wed Apr 30 23:20:45 2008 @@ -357,9 +357,11 @@ void setHardLockQueries( const HardLockQueries & newLocks_r ); /** Suggest a new set of queries based on the current selection. - * (usually remembered on commit). + * (usually remembered on commit). Returns whether the sugested + * set differs from the one that was previously set via + * \ref setHardLockQueries. */ - void getHardLockQueries( HardLockQueries & activeLocks_r ); + bool getHardLockQueries( HardLockQueries & activeLocks_r ); //@} private: Modified: trunk/libzypp/zypp/ResStatus.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.cc?rev=99… ============================================================================== --- trunk/libzypp/zypp/ResStatus.cc (original) +++ trunk/libzypp/zypp/ResStatus.cc Wed Apr 30 23:20:45 2008 @@ -100,9 +100,7 @@ str << (obj.isRecommended() ? "r" : "" ); str << (obj.isSuggested() ? "s" : "" ); -#ifdef HARDLOCKTEST - str << (obj.isUserLockQueryMatch() ? "L" : "_" ); -#endif + return str; } Modified: trunk/libzypp/zypp/pool/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/pool/PoolImpl.h?rev… ============================================================================== --- trunk/libzypp/zypp/pool/PoolImpl.h (original) +++ trunk/libzypp/zypp/pool/PoolImpl.h Wed Apr 30 23:20:45 2008 @@ -21,7 +21,7 @@ #include "zypp/pool/PoolTraits.h" #include "zypp/ResPoolProxy.h" -#include "zypp/PoolQuery.h" +#include "zypp/PoolQueryResult.h" #include "zypp/sat/Pool.h" @@ -30,6 +30,78 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// + + namespace resstatus + { + /** Manipulator for \ref ResStatus::UserLockQueryField. + * Field is not public available. It is intended to remember the + * initial lock status usually derived from /etc/zypp/locks. So + * we are able to detect changes we have to write back on commit. + */ + struct UserLockQueryManip + { + /** Set lock and UserLockQuery bit according to \c yesno_r. */ + static void setLock( ResStatus & status_r, bool yesno_r ) + { + status_r.setLock( yesno_r, ResStatus::USER ); + status_r.setUserLockQueryMatch( yesno_r ); + } + + /** Update lock and UserLockQuery bit IFF the item gained the bit. */ + static void reapplyLock( ResStatus & status_r, bool yesno_r ) + { + if ( yesno_r && ! status_r.isUserLockQueryMatch() ) + { + status_r.setLock( yesno_r, ResStatus::USER ); + status_r.setUserLockQueryMatch( yesno_r ); + } + } + + /** Test whether the lock status differs from the remembered UserLockQuery bit. */ + static int diffLock( const ResStatus & status_r ) + { + if ( status_r.isLocked() == status_r.isUserLockQueryMatch() ) + return 0; + return status_r.isLocked() ? 1 : -1; + } + + }; + } + + namespace + { + inline PoolQuery makeTrivialQuery( IdString ident_r ) + { + sat::Solvable::SplitIdent ident( ident_r ); + + PoolQuery q; + q.addAttribute( sat::SolvAttr::name, ident.name().asString() ); + q.addKind( ident.kind() ); + q.setMatchExact(); + q.setCaseSensitive(true); + return q; + } + + inline bool hardLockQueriesRemove( pool::PoolTraits::HardLockQueries & activeLocks_r, IdString ident_r ) + { + unsigned s( activeLocks_r.size() ); + activeLocks_r.remove( makeTrivialQuery( ident_r ) ); + return( activeLocks_r.size() != s ); + } + + inline bool hardLockQueriesAdd( pool::PoolTraits::HardLockQueries & activeLocks_r, IdString ident_r ) + { + PoolQuery q( makeTrivialQuery( ident_r ) ); + for_( it, activeLocks_r.begin(), activeLocks_r.end() ) + { + if ( *it == q ) + return false; + } + activeLocks_r.push_back( q ); + return true; + } + } + /////////////////////////////////////////////////////////////////// namespace pool { ///////////////////////////////////////////////////////////////// @@ -147,9 +219,21 @@ void reapplyHardLocks() const { -#ifdef HARDLOCKTEST - SEC << "reapplyHardLocks " << endl; -#endif + // It is assumed that reapplyHardLocks is called after new + // items were added to the pool, but the _hardLockQueries + // did not change since. Action is to be performed only on + // those items that gained the bit in the UserLockQueryField. + MIL << "Re-apply " << _hardLockQueries.size() << " HardLockQueries" << endl; + PoolQueryResult locked; + for_( it, _hardLockQueries.begin(), _hardLockQueries.end() ) + { + locked += *it; + } + MIL << "HardLockQueries match " << locked.size() << " Solvables." << endl; + for_( it, begin(), end() ) + { + resstatus::UserLockQueryManip::reapplyLock( it->status(), locked.contains( *it ) ); + } } void setHardLockQueries( const HardLockQueries & newLocks_r ) @@ -157,14 +241,57 @@ MIL << "Apply " << newLocks_r.size() << " HardLockQueries" << endl; _hardLockQueries = newLocks_r; // now adjust the pool status - // TBD + PoolQueryResult locked; + for_( it, _hardLockQueries.begin(), _hardLockQueries.end() ) + { + locked += *it; + } + MIL << "HardLockQueries match " << locked.size() << " Solvables." << endl; + for_( it, begin(), end() ) + { + resstatus::UserLockQueryManip::setLock( it->status(), locked.contains( *it ) ); + } } - void getHardLockQueries( HardLockQueries & activeLocks_r ) + bool getHardLockQueries( HardLockQueries & activeLocks_r ) { activeLocks_r = _hardLockQueries; // current queries - // TBD - } + // Now diff to the pool collecting names only. + // Thus added and removed locks are not necessarily + // disjoint. Added locks win. + typedef std::tr1::unordered_set<IdString> IdentSet; + IdentSet addedLocks; + IdentSet removedLocks; + for_( it, begin(), end() ) + { + switch ( resstatus::UserLockQueryManip::diffLock( it->status() ) ) + { + case 0: // unchanged + break; + case 1: + addedLocks.insert( it->satSolvable().ident() ); + break; + case -1: + removedLocks.insert( it->satSolvable().ident() ); + break; + } + } + // now the bad part - adjust the queries + bool setChanged = false; + for_( it, removedLocks.begin(), removedLocks.end() ) + { + if ( addedLocks.find( *it ) != addedLocks.end() ) + continue; // Added locks win + if ( hardLockQueriesRemove( activeLocks_r, *it ) && ! setChanged ) + setChanged = true; + } + for_( it, addedLocks.begin(), addedLocks.end() ) + { + if ( hardLockQueriesAdd( activeLocks_r, *it ) && ! setChanged ) + setChanged = true; + } + return setChanged; + } public: typedef PoolTraits::AutoSoftLocks AutoSoftLocks; @@ -237,10 +364,6 @@ sat::Pool pool( satpool() ); bool addedItems = false; -#ifdef HARDLOCKTEST -#warning REMOVE FAKE REMOVE FAKE REMOVE FAKE REMOVE FAKE - addedItems = true; -#endif if ( pool.capacity() != _store.capacity() ) { _store.resize( pool.capacity() ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9923 - /trunk/libzypp/zypp/PoolQueryResult.h
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Wed Apr 30 23:16:07 2008 New Revision: 9923 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9923&view=rev Log: Add PoolQueryResult::contains Modified: trunk/libzypp/zypp/PoolQueryResult.h Modified: trunk/libzypp/zypp/PoolQueryResult.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryResult.h?r… ============================================================================== --- trunk/libzypp/zypp/PoolQueryResult.h (original) +++ trunk/libzypp/zypp/PoolQueryResult.h Wed Apr 30 23:16:07 2008 @@ -120,6 +120,13 @@ const_iterator end() const { return _result.end(); } + /** Test whether some item is in the result set. */ + bool contains(sat::Solvable result_r ) const + { return( _result.find( result_r ) != _result.end() ); } + /** \overload */ + bool contains( const PoolItem & result_r ) const + { return contains( result_r.satSolvable() ); } + public: /** Clear the result. */ void clear() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9922 - /trunk/libzypp/zypp/PoolQuery.cc
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Wed Apr 30 23:15:22 2008 New Revision: 9922 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9922&view=rev Log: Use own logclass for PoolQuery Modified: trunk/libzypp/zypp/PoolQuery.cc Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=99… ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Wed Apr 30 23:15:22 2008 @@ -28,6 +28,9 @@ #include "satsolver/repo.h" } +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "PoolQuery" + using namespace std; using namespace zypp::sat; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9921 - in /trunk/libzypp/zypp: sat/detail/PoolImpl.cc target/CommitLog.cc target/CommitLog.h target/TargetImpl.cc
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

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… ============================================================================== --- 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… ============================================================================== --- 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?… ============================================================================== --- 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.c… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9920 - in /trunk/libzypp/zypp: Atom.h Message.h ResKind.h Script.h
by mlandres＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mlandres Date: Wed Apr 30 19:57:26 2008 New Revision: 9920 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9920&view=rev Log: deprecate script message and atom Modified: trunk/libzypp/zypp/Atom.h trunk/libzypp/zypp/Message.h trunk/libzypp/zypp/ResKind.h trunk/libzypp/zypp/Script.h Modified: trunk/libzypp/zypp/Atom.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Atom.h?rev=9920&r1=… ============================================================================== --- trunk/libzypp/zypp/Atom.h (original) +++ trunk/libzypp/zypp/Atom.h Wed Apr 30 19:57:26 2008 @@ -22,6 +22,9 @@ // // CLASS NAME : Atom // + /** + * \deprecated class is obsolete + */ class Atom : public ResObject { public: @@ -33,7 +36,7 @@ protected: friend Ptr make<Self>( const sat::Solvable & solvable_r ); /** Ctor */ - Atom( const sat::Solvable & solvable_r ); + Atom( const sat::Solvable & solvable_r ) ZYPP_DEPRECATED; /** Dtor */ virtual ~Atom(); }; Modified: trunk/libzypp/zypp/Message.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Message.h?rev=9920&… ============================================================================== --- trunk/libzypp/zypp/Message.h (original) +++ trunk/libzypp/zypp/Message.h Wed Apr 30 19:57:26 2008 @@ -24,6 +24,7 @@ // CLASS NAME : Message // /** Class representing the message to be shown during update. + * \deprecated class is obsolete */ class Message : public ResObject { @@ -35,14 +36,14 @@ public: /** Get the text of the message */ - TranslatedText text() const; + TranslatedText text() const ZYPP_DEPRECATED; /** Patch the message belongs to - if any */ - ResTraits<Patch>::constPtrType patch() const; + ResTraits<Patch>::constPtrType patch() const ZYPP_DEPRECATED; protected: friend Ptr make<Self>( const sat::Solvable & solvable_r ); /** Ctor */ - Message( const sat::Solvable & solvable_r ); + Message( const sat::Solvable & solvable_r ) ZYPP_DEPRECATED; /** Dtor */ virtual ~Message(); }; Modified: trunk/libzypp/zypp/ResKind.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResKind.h?rev=9920&… ============================================================================== --- trunk/libzypp/zypp/ResKind.h (original) +++ trunk/libzypp/zypp/ResKind.h Wed Apr 30 19:57:26 2008 @@ -15,6 +15,7 @@ #include <iosfwd> #include <string> +#include "zypp/base/Deprecated.h" #include "zypp/base/String.h" #include "zypp/IdStringType.h" @@ -39,13 +40,13 @@ /** Value representing \c nokind (<tt>""</tt>)*/ static const ResKind nokind; - static const ResKind atom; - static const ResKind message; + static const ResKind atom ZYPP_DEPRECATED; + static const ResKind message ZYPP_DEPRECATED; static const ResKind package; static const ResKind patch; static const ResKind pattern; static const ResKind product; - static const ResKind script; + static const ResKind script ZYPP_DEPRECATED; static const ResKind srcpackage; //@} Modified: trunk/libzypp/zypp/Script.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Script.h?rev=9920&r… ============================================================================== --- trunk/libzypp/zypp/Script.h (original) +++ trunk/libzypp/zypp/Script.h Wed Apr 30 19:57:26 2008 @@ -23,7 +23,8 @@ // CLASS NAME : Script // /** Class representing an update script. - */ + * \deprecated class is obsolete + */ class Script : public ResObject { public: @@ -34,17 +35,17 @@ public: /** Check whether a script is available. */ - bool doAvailable() const; + bool doAvailable() const ZYPP_DEPRECATED; /** Return an inlined script if available. * Otherwise it is available at \ref doScriptLocation. */ - std::string doScriptInlined() const; + std::string doScriptInlined() const ZYPP_DEPRECATED; /** Location of the script, unless it is available inlined. * \see \ref doScriptInlined */ - OnMediaLocation doScriptLocation() const; + OnMediaLocation doScriptLocation() const ZYPP_DEPRECATED; /** Check whether a script to undo the change is available. */ bool undoAvailable() const; @@ -52,17 +53,17 @@ /** Return an inlined undo script if available. * Otherwise it is available at \ref undoScriptLocation. */ - std::string undoScriptInlined() const; + std::string undoScriptInlined() const ZYPP_DEPRECATED; /** Location of the undo script, unless it is available inlined. * \see \ref undoScriptInlined */ - OnMediaLocation undoScriptLocation() const; + OnMediaLocation undoScriptLocation() const ZYPP_DEPRECATED; protected: friend Ptr make<Self>( const sat::Solvable & solvable_r ); /** Ctor */ - Script( const sat::Solvable & solvable_r ); + Script( const sat::Solvable & solvable_r ) ZYPP_DEPRECATED; /** Dtor */ virtual ~Script(); }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r9919 - /trunk/zypper/zypper.spec.cmake
by jkupec＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: jkupec Date: Wed Apr 30 19:00:23 2008 New Revision: 9919 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9919&view=rev Log: update Modified: trunk/zypper/zypper.spec.cmake Modified: trunk/zypper/zypper.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=991… ============================================================================== --- trunk/zypper/zypper.spec.cmake (original) +++ trunk/zypper/zypper.spec.cmake Wed Apr 30 19:00:23 2008 @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 4.16.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 +BuildRequires: libzypp-devel >= 4.18.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps Recommends: logrotate cron -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0