August 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7071 - /trunk/libzypp/zypp/target/TargetImpl.cc
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 23:23:29 2007 New Revision: 7071 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7071&view=rev Log: logline added Modified: trunk/libzypp/zypp/target/TargetImpl.cc 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 Fri Aug 31 23:23:29 2007 @@ -468,6 +468,7 @@ result._result = (to_install.size() - result._remaining.size()); + MIL << "TargetImpl::commit(<pool>, " << policy_r << ") returns: " << result << endl; return result; } -- 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] r7070 - /trunk/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 22:19:05 2007 New Revision: 7070 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7070&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes 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 Fri Aug 31 22:19:05 2007 @@ -6,6 +6,7 @@ download.use_patchrpm = no download.use_deltarpm = no - version 3.22.0 +- revision 7069 ------------------------------------------------------------------- Fri Aug 31 19:56:40 CEST 2007 - ma(a)suse.de -- 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] r7069 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/repo/PackageProvider.cc
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 22:18:35 2007 New Revision: 7069 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7069&view=rev Log: Follow ZConfig download_use_patchrpm and download_use_deltarpm when providing packages. (#305864) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/repo/PackageProvider.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7069&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Aug 31 22:18:35 2007 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "3") -SET(LIBZYPP_MINOR "21") +SET(LIBZYPP_MINOR "22") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "0") 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 Fri Aug 31 22:18:35 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Aug 31 22:10:55 CEST 2007 - ma(a)suse.de + +- Added ability to switch off use of patch and delta rpms via zypp.conf (#305864) + [main] + download.use_patchrpm = no + download.use_deltarpm = no +- version 3.22.0 + +------------------------------------------------------------------- Fri Aug 31 19:56:40 CEST 2007 - ma(a)suse.de - On demand translate patch requirements into a list of atoms. Modified: trunk/libzypp/zypp/repo/PackageProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvide… ============================================================================== --- trunk/libzypp/zypp/repo/PackageProvider.cc (original) +++ trunk/libzypp/zypp/repo/PackageProvider.cc Fri Aug 31 22:18:35 2007 @@ -22,6 +22,7 @@ #include "zypp/repo/PackageDelta.h" #include "zypp/detail/ImplConnect.h" +#include "zypp/ZConfig.h" #include "zypp/RepoInfo.h" #include "zypp/Repository.h" #include "zypp/media/MediaManager.h" @@ -133,8 +134,17 @@ // check whether to process patch/delta rpms if ( MediaManager::downloads(url) ) { - std::list<DeltaRpm> deltaRpms = _deltas.deltaRpms(_package); - std::list<PatchRpm> patchRpms = _deltas.patchRpms(_package); + std::list<DeltaRpm> deltaRpms; + if ( ZConfig::instance().download_use_deltarpm() ) + { + _deltas.deltaRpms( _package ).swap( deltaRpms ); + } + + std::list<PatchRpm> patchRpms; + if ( ZConfig::instance().download_use_patchrpm() ) + { + _deltas.patchRpms( _package ).swap( patchRpms ); + } if ( ! ( deltaRpms.empty() && patchRpms.empty() ) && queryInstalled() ) @@ -167,7 +177,12 @@ else { // allow patch rpm from local source - std::list<PatchRpm> patchRpms = _deltas.patchRpms(_package); + std::list<PatchRpm> patchRpms; + if ( ZConfig::instance().download_use_patchrpm() ) + { + _deltas.patchRpms( _package ).swap( patchRpms ); + } + if ( ! patchRpms.empty() && queryInstalled() ) { for( std::list<PatchRpm>::const_iterator it = patchRpms.begin(); @@ -184,7 +199,7 @@ // no patch/delta -> provide full package ManagedFile ret; OnMediaLocation loc = _package->location(); - + ProvideFilePolicy policy; policy.progressCB( bind( &PackageProvider::progressPackageDownload, this, _1 ) ); policy.failOnChecksumErrorCB( bind( &PackageProvider::failOnChecksumError, this ) ); -- 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] r7068 - in /trunk/libzypp: devel/devel.ma/Parse.cc zypp/ZConfig.cc zypp/ZConfig.h
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 21:41:15 2007 New Revision: 7068 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7068&view=rev Log: Added "bool ZConfig::download_use_patchrpm()" and "bool ZConfig::download_use_deltarpm()" and corresponding zypp.conf entries: [main] download.use_patchrpm = true download.use_deltarpm = true Modified: trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Fri Aug 31 21:41:15 2007 @@ -345,6 +345,12 @@ { //zypp::base::LogControl::instance().logfile( "log.restrict" ); INT << "===[START]==========================================" << endl; + setenv( "ZYPP_CONF", "/Local/ROOT/zypp.conf", 1 ); + + + INT << ZConfig::instance().download_use_patchrpm() << endl; + INT << ZConfig::instance().download_use_deltarpm() << endl; + return 0; DigestReceive foo; KeyRingSignalsReceive baa; Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=7068… ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Fri Aug 31 21:41:15 2007 @@ -12,6 +12,7 @@ #include <iostream> #include "zypp/base/Logger.h" #include "zypp/base/InputStream.h" +#include "zypp/base/String.h" #include "zypp/ZConfig.h" #include "zypp/ZYppFactory.h" @@ -31,14 +32,20 @@ // CLASS NAME : ZConfig::Impl // /** ZConfig implementation. + * \todo Enrich section and entry definition by some comment + * (including the default setting and provide some method to + * write this into a sample zypp.conf. */ class ZConfig::Impl { public: Impl() - : repo_add_probe(false), - repo_refresh_delay(10), - autolock_untrustedvendor(false) + : repo_add_probe ( false ) + , repo_refresh_delay ( 10 ) + , download_use_patchrpm ( true ) + , download_use_deltarpm ( true ) + , autolock_untrustedvendor( false ) + { MIL << "ZConfig singleton created." << endl; @@ -54,21 +61,22 @@ else { MIL << confpath << " not found, using defaults instead." << endl; + return; } - - for ( IniDict::section_const_iterator sit = dict.sectionsBegin(); + + for ( IniDict::section_const_iterator sit = dict.sectionsBegin(); sit != dict.sectionsEnd(); ++sit ) { string section(*sit); //MIL << section << endl; - for ( IniDict::entry_const_iterator it = dict.entriesBegin(*sit); + for ( IniDict::entry_const_iterator it = dict.entriesBegin(*sit); it != dict.entriesEnd(*sit); ++it ) { string entry(it->first); string value(it->second); - // DBG << (*it).first << "=" << (*it).second << endl; + //DBG << (*it).first << "=" << (*it).second << endl; if ( section == "main" ) { if ( entry == "arch" ) @@ -89,41 +97,52 @@ } else if ( entry == "repo.add.probe" ) { - repo_add_probe = (value == "1"); + repo_add_probe = str::strToBool( value, repo_add_probe ); } else if ( entry == "repo.refresh.delay" ) { str::strtonum(value, repo_refresh_delay); } + else if ( entry == "download.use_patchrpm" ) + { + download_use_patchrpm = str::strToBool( value, download_use_patchrpm ); + } + else if ( entry == "download.use_deltarpm" ) + { + download_use_deltarpm = str::strToBool( value, download_use_deltarpm ); + } } else if ( section == "locking" ) { - autolock_untrustedvendor = ( value == "1" ); + autolock_untrustedvendor = str::strToBool( value, autolock_untrustedvendor ); } - + } } - + } ~Impl() {} - + public: parser::IniDict dict; - + Arch cfg_arch; - + Pathname cfg_metadata_path; Pathname cfg_cache_path; Pathname cfg_known_repos_path; - + bool repo_add_probe; unsigned repo_refresh_delay; - + + bool download_use_patchrpm; + bool download_use_deltarpm; + // [locking] bool autolock_untrustedvendor; - + }; /////////////////////////////////////////////////////////////////// @@ -146,7 +165,7 @@ ZConfig::ZConfig() : _pimpl( new Impl ) { - + } /////////////////////////////////////////////////////////////////// @@ -197,19 +216,19 @@ Pathname ZConfig::repoMetadataPath() const { - return ( _pimpl->cfg_metadata_path.empty() + return ( _pimpl->cfg_metadata_path.empty() ? Pathname("/var/cache/zypp/raw") : _pimpl->cfg_metadata_path ); } Pathname ZConfig::repoCachePath() const { - return ( _pimpl->cfg_cache_path.empty() + return ( _pimpl->cfg_cache_path.empty() ? Pathname("/var/cache/zypp") : _pimpl->cfg_cache_path ); } Pathname ZConfig::knownReposPath() const { - return ( _pimpl->cfg_known_repos_path.empty() + return ( _pimpl->cfg_known_repos_path.empty() ? Pathname("/etc/zypp/repos.d") : _pimpl->cfg_known_repos_path ); } @@ -229,11 +248,17 @@ return _pimpl->repo_refresh_delay; } + bool ZConfig::download_use_patchrpm() const + { return _pimpl->download_use_patchrpm; } + + bool ZConfig::download_use_deltarpm() const + { return _pimpl->download_use_deltarpm; } + bool ZConfig::autolock_untrustedvendor() const { return _pimpl->autolock_untrustedvendor; } - + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=7068&… ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Fri Aug 31 21:41:15 2007 @@ -94,13 +94,23 @@ */ unsigned repo_refresh_delay() const; + /** Whether to consider using a patchrpm when downloading a package. + * Config option <tt>download.use_patchrpm (true)</tt> + */ + bool download_use_patchrpm() const; + + /** Whether to consider using a deltarpm when downloading a package. + * Config option <tt>download.use_deltarpm (true)</tt> + */ + bool download_use_deltarpm() const; + /** * Whether untrusted vendor should be autolocked / config option * repo.add.probe */ bool autolock_untrustedvendor() const; - + public: class Impl; /** Dtor */ -- 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] r7067 - in /trunk/libzypp/zypp/base: String.cc String.h
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 21:27:15 2007 New Revision: 7067 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7067&view=rev Log: Added str::strToTrue, str::sstrToFalse and str::sstrToBool to parse boolean values from string. Modified: trunk/libzypp/zypp/base/String.cc trunk/libzypp/zypp/base/String.h Modified: trunk/libzypp/zypp/base/String.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/base/String.cc (original) +++ trunk/libzypp/zypp/base/String.cc Fri Aug 31 21:27:15 2007 @@ -54,6 +54,36 @@ /****************************************************************** ** + ** FUNCTION NAME : strToTrue + ** FUNCTION TYPE : bool + */ + bool strToTrue( const std::string & str ) + { + std::string t( toLower( str ) ); + return( t == "1" + || t == "yes" + || t == "true" + || t == "on" + ); + } + + /****************************************************************** + ** + ** FUNCTION NAME : strToFalse + ** FUNCTION TYPE : bool + */ + bool strToFalse( const std::string & str ) + { + std::string t( toLower( str ) ); + return ! ( t == "0" + || t == "no" + || t == "false" + || t == "off" + ); + } + + /****************************************************************** + ** ** FUNCTION NAME : toLower ** FUNCTION TYPE : std::string */ @@ -160,26 +190,26 @@ string gsub(const string& sData, const string& sFrom, const string& sTo) { string sNew = sData; - + if (! sNew.empty()) { string::size_type toLen = sTo.length(); string::size_type frLen = sFrom.length(); string::size_type loc = 0; - + while (string::npos != (loc = sNew.find(sFrom, loc))) { sNew.replace(loc, frLen, sTo); loc += toLen; - + if (loc >= sNew.length()) break; } } - + return sNew; } - + /****************************************************************** ** ** Modified: trunk/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.h?rev=7… ============================================================================== --- trunk/libzypp/zypp/base/String.h (original) +++ trunk/libzypp/zypp/base/String.h Fri Aug 31 21:27:15 2007 @@ -213,6 +213,24 @@ //@} /////////////////////////////////////////////////////////////////// + /** Parsing boolean from string. + */ + //@{ + /** Return \c true if str is <tt>1, true, yes, on</tt>. */ + bool strToTrue( const std::string & str ); + + /** Return \c false if str is <tt>0, false, no, off</tt>. */ + bool strToFalse( const std::string & str ); + + /** Parse \c str into a bool depending on the default value. + * If the \c default is true, look for a legal \c false string. + * If the \c default is false, look for a legal \c true string. + */ + inline bool strToBool( const std::string & str, bool default_r ) + { return( default_r ? strToFalse( str ) : strToTrue( str ) ); } + //@} + + /////////////////////////////////////////////////////////////////// /** \name Split. */ //@{ /** Split \a line_r into words. @@ -329,7 +347,7 @@ */ std::string gsub( const std::string& sData, const std::string& sFrom, const std::string& sTo); - + /////////////////////////////////////////////////////////////////// /** \name String prefix handling. -- 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] r7066 - /trunk/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 19:58:43 2007 New Revision: 7066 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7066&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes 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 Fri Aug 31 19:58:43 2007 @@ -5,6 +5,7 @@ Required by the UI to display packages acssociated with a patch. (#300612) - version 3.21.1 +- revision 7065 ------------------------------------------------------------------- Fri Aug 31 13:59:54 CEST 2007 - kkaempf(a)suse.de -- 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] r7065 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/detail/PatchImplIf.cc zypp/detail/PatchImplIf.h
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 19:58:27 2007 New Revision: 7065 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7065&view=rev Log: - On demand translate patch requirements into a list of atoms. Required by the UI to display packages acssociated with a patch. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/detail/PatchImplIf.cc trunk/libzypp/zypp/detail/PatchImplIf.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7065&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Aug 31 19:58:27 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "21") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") 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 Fri Aug 31 19:58:27 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Aug 31 19:56:40 CEST 2007 - ma(a)suse.de + +- On demand translate patch requirements into a list of atoms. + Required by the UI to display packages acssociated with a patch. + (#300612) +- version 3.21.1 + +------------------------------------------------------------------- Fri Aug 31 13:59:54 CEST 2007 - kkaempf(a)suse.de - enrich ResolverInfo with the reason if a user-initiated request Modified: trunk/libzypp/zypp/detail/PatchImplIf.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/PatchImplIf.… ============================================================================== --- trunk/libzypp/zypp/detail/PatchImplIf.cc (original) +++ trunk/libzypp/zypp/detail/PatchImplIf.cc Fri Aug 31 19:58:27 2007 @@ -9,8 +9,17 @@ /** \file zypp/detail/PatchImplIf.cc * */ +#include <iostream> + +#include "zypp/base/Easy.h" +#include "zypp/base/Logger.h" +#include "zypp/ResStore.h" +#include "zypp/CapMatchHelper.h" + #include "zypp/detail/PatchImplIf.h" +using std::endl; + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -61,7 +70,43 @@ PatchImplIf::AtomList PatchImplIf::all_atoms() const { - return AtomList(); + if ( ! _atomlist ) + { + if ( ! hasBackRef() ) + { + // We are not jet connected to the Resolvable that + // contains our dependencies. + return AtomList(); + } + + // lazy init + _atomlist.reset( new AtomList ); + + // Build the list using the repositories resolvables. + // Installed Patches (no repository) have this method overloaded. + if ( repository() ) + { + const CapSet & requires( self()->dep( Dep::REQUIRES ) ); + const ResStore & store( repository().resolvables() ); + + for_( req, requires.begin(), requires.end() ) + { + // lookup Patch requirements that refer to an Atom, Script or Message. + if ( refersTo<Atom>( *req ) || refersTo<Script>( *req ) || refersTo<Message>( *req ) ) + { + for_( res, store.begin(), store.end() ) + { + // Collect ALL matches in the store. + if ( hasMatches( (*res)->dep( Dep::PROVIDES ), (*req) ) ) + { + _atomlist->push_back( *res ); + } + } + } + } + } + } + return *_atomlist; } ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/detail/PatchImplIf.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/PatchImplIf.… ============================================================================== --- trunk/libzypp/zypp/detail/PatchImplIf.h (original) +++ trunk/libzypp/zypp/detail/PatchImplIf.h Fri Aug 31 19:58:27 2007 @@ -60,6 +60,9 @@ * \warning Computed here, usually no need to overload this. */ virtual AtomList all_atoms() const PURE_VIRTUAL; + + private: + mutable scoped_ptr<AtomList> _atomlist; }; /////////////////////////////////////////////////////////////////// -- 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] r7064 - in /trunk/libzypp/devel/devel.ma: Parse.cc Tools.h
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 19:48:29 2007 New Revision: 7064 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7064&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/devel/devel.ma/Tools.h Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Fri Aug 31 19:48:29 2007 @@ -34,6 +34,8 @@ #include "zypp/RepoManager.h" #include "zypp/RepoInfo.h" +#include "zypp/ui/PatchContents.h" + using namespace std; using namespace zypp; using namespace zypp::functor; @@ -50,7 +52,8 @@ { bool operator()( const PoolItem & obj_r ) { - handle( asKind<Package>( obj_r ) ); + //handle( asKind<Package>( obj_r ) ); + handle( asKind<Patch>( obj_r ) ); //handle( asKind<Pattern>( obj_r ) ); //handle( asKind<Product>( obj_r ) ); return true; @@ -61,7 +64,18 @@ if ( !p ) return; - //MIL << p->diskusage() << endl; + MIL << p->diskusage() << endl; + } + + void handle( const Patch_constPtr & p ) + { + if ( !p ) + return; + + ui::PatchContents pc( p ); + MIL << p << endl; + dumpRange( DBG << pc.size() << endl, + pc.begin(), pc.end() ); } void handle( const Pattern_constPtr & p ) @@ -262,7 +276,7 @@ struct MediaChangeReceive : public callback::ReceiveReport<media::MediaChangeReport> { - virtual Action requestMedia( Repository source + virtual Action requestMedia( Url & source , unsigned mediumNr , Error error , const std::string & description ) @@ -332,19 +346,6 @@ //zypp::base::LogControl::instance().logfile( "log.restrict" ); INT << "===[START]==========================================" << endl; - { - AutoDispose<int> fd( 0 ); - SEC << fd << endl; - fd = ::open( "/tmp/foo", 1 ); - SEC << fd << endl; - - if ( fd == -1 ) - ; // error report - else - fd.setDispose( ::close ); - } - return 0; - DigestReceive foo; KeyRingSignalsReceive baa; Modified: trunk/libzypp/devel/devel.ma/Tools.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Tools.h?r… ============================================================================== --- trunk/libzypp/devel/devel.ma/Tools.h (original) +++ trunk/libzypp/devel/devel.ma/Tools.h Fri Aug 31 19:48:29 2007 @@ -10,6 +10,7 @@ #include "Printing.h" #include "FakePool.h" +#include <zypp/base/Easy.h> #include <zypp/base/Counter.h> #include <zypp/base/Measure.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] r7063 - /trunk/libzypp/zypp/CapMatchHelper.h
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 19:48:04 2007 New Revision: 7063 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7063&view=rev Log: Added "bool hasMatches( const CapSet & lhs_r, const Capability & rhs_r )" to thest whther the CapSet contains at least one match for rhs_r Modified: trunk/libzypp/zypp/CapMatchHelper.h Modified: trunk/libzypp/zypp/CapMatchHelper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CapMatchHelper.h?re… ============================================================================== --- trunk/libzypp/zypp/CapMatchHelper.h (original) +++ trunk/libzypp/zypp/CapMatchHelper.h Fri Aug 31 19:48:04 2007 @@ -146,9 +146,19 @@ { bool operator()( const Capability &, const Capability & ) const { return false; } + bool operator()( const Capability & ) const + { return false; } }; } + /** Return \c true if the CapSet contains at least one Capabilitiy + * that matches. + */ + inline bool hasMatches( const CapSet & lhs_r, const Capability & rhs_r ) + { + return( forEachMatchIn( lhs_r, rhs_r, capmatch_detail::AlwaysFalse() ) < 0 ); + } + /** Return \c true if the CapSets contain at least one pair of * Capabilities that match. */ -- 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] r7062 - /trunk/libzypp/zypp/Capability.h
by mlandres＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: mlandres Date: Fri Aug 31 19:46:27 2007 New Revision: 7062 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7062&view=rev Log: Added refersTo() to test whether a capability refers to a certain kind of resolvable. E.g.: if ( refersTo<Script>( cap ) ) ... Modified: trunk/libzypp/zypp/Capability.h Modified: trunk/libzypp/zypp/Capability.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Capability.h?rev=70… ============================================================================== --- trunk/libzypp/zypp/Capability.h (original) +++ trunk/libzypp/zypp/Capability.h Fri Aug 31 19:46:27 2007 @@ -143,6 +143,10 @@ inline bool isKind( const Capability & cap ) { return cap.kind() == capability::CapTraits<_Cap>::kind; } + template<class _Res> + inline bool refersTo( const Capability & cap ) + { return cap.refers() == ResTraits<_Res>::kind; } + /////////////////////////////////////////////////////////////////// /** Ordering relation used by ::CapSet. */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0