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&r1=7068&r2=7069&view=diff ============================================================================== --- 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?rev=7069&r1=7068&r2=7069&view=diff ============================================================================== --- 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@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@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/PackageProvider.cc?rev=7069&r1=7068&r2=7069&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org