Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10535 - in /trunk/libzypp: zypp.conf zypp/ZConfig.cc zypp/ZConfig.h zypp/repo/PackageProvider.cc
  • From: schubi2@xxxxxxxxxxxxxxxx
  • Date: Fri, 11 Jul 2008 09:50:37 -0000
  • Message-id: <20080711095037.79F1024AFB@xxxxxxxxxxxxxxxx>
Author: schubi2
Date: Fri Jul 11 11:50:37 2008
New Revision: 10535

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10535&view=rev
Log:
remove patchrpm handling

Modified:
trunk/libzypp/zypp.conf
trunk/libzypp/zypp/ZConfig.cc
trunk/libzypp/zypp/ZConfig.h
trunk/libzypp/zypp/repo/PackageProvider.cc

Modified: trunk/libzypp/zypp.conf
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=10535&r1=10534&r2=10535&view=diff
==============================================================================
--- trunk/libzypp/zypp.conf (original)
+++ trunk/libzypp/zypp.conf Fri Jul 11 11:50:37 2008
@@ -122,20 +122,6 @@


##
-## Whether to consider using a .patch.rpm when downloading a package
-##
-## Valid values: boolean
-## Default value: true
-##
-## Using a patch rpm will decrease the download size for package updates
-## since it does not contain all files of the package but only the changed
-## ones. The .patch.rpm is ready to be installed immediately after download.
-## There is no further processing needed, as it is for a .delta.rpm.
-##
-# download.use_patchrpm = true
-
-
-##
## Whether to consider using a .delta.rpm when downloading a package
##
## Valid values: boolean

Modified: trunk/libzypp/zypp/ZConfig.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=10535&r1=10534&r2=10535&view=diff
==============================================================================
--- trunk/libzypp/zypp/ZConfig.cc (original)
+++ trunk/libzypp/zypp/ZConfig.cc Fri Jul 11 11:50:37 2008
@@ -146,7 +146,6 @@
, cfg_textLocale ( defaultTextLocale() )
, repo_add_probe ( false )
, repo_refresh_delay ( 10 )
- , download_use_patchrpm ( true )
, download_use_deltarpm ( true )
, solver_onlyRequires ( false )
, apply_locks_file ( true )
@@ -230,10 +229,6 @@
{
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 );
@@ -322,7 +317,6 @@
bool repo_add_probe;
unsigned repo_refresh_delay;

- bool download_use_patchrpm;
bool download_use_deltarpm;

bool solver_onlyRequires;
@@ -498,9 +492,6 @@
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; }


Modified: trunk/libzypp/zypp/ZConfig.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=10535&r1=10534&r2=10535&view=diff
==============================================================================
--- trunk/libzypp/zypp/ZConfig.h (original)
+++ trunk/libzypp/zypp/ZConfig.h Fri Jul 11 11:50:37 2008
@@ -152,11 +152,6 @@
*/
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>
*/

Modified: trunk/libzypp/zypp/repo/PackageProvider.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvider.cc?rev=10535&r1=10534&r2=10535&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/PackageProvider.cc (original)
+++ trunk/libzypp/zypp/repo/PackageProvider.cc Fri Jul 11 11:50:37 2008
@@ -177,10 +177,13 @@
{
// allow patch rpm from local source
std::list<PatchRpm> patchRpms;
+#warning cleanup patchrpm
+#if 0
if ( ZConfig::instance().download_use_patchrpm() )
{
_deltas.patchRpms( _package ).swap( patchRpms );
}
+#endif

if ( ! patchRpms.empty() && queryInstalled() )
{

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages