ref: refs/heads/ma-misc
commit 4ca181c4abc96c3e8f5d5d77a783f025878b23e5
Author: Michael Andres
Date: Thu Oct 15 19:55:38 2009 +0200
Fix typo
---
zypp.conf | 2 +-
zypp/Product.h | 4 ++--
zypp/ZConfig.cc | 14 +++++++-------
zypp/ZConfig.h | 10 +++++-----
zypp/solver/detail/SATResolver.cc | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/zypp.conf b/zypp.conf
index ba3f8aa..c62d21d 100644
--- a/zypp.conf
+++ b/zypp.conf
@@ -307,7 +307,7 @@
## Valid values: Boolean
## Default value: true
##
-# solver.upgradeRemoveDropedPackages = true
+# solver.upgradeRemoveDroppedPackages = true
##
## Packages which are parallel installable with
diff --git a/zypp/Product.h b/zypp/Product.h
index 88c4b66..7632803 100644
--- a/zypp/Product.h
+++ b/zypp/Product.h
@@ -56,8 +56,8 @@ namespace zypp
* installed and available packages matching this list.
* \code
* const Product & openSUSE;
- * sat::WhatProvides droped( openSUSE.droplist() );
- * for_( it, droped.poolItemBegin(), dropped.poolItemEnd() )
+ * sat::WhatProvides dropped( openSUSE.droplist() );
+ * for_( it, dropped.poolItemBegin(), dropped.poolItemEnd() )
* {
* if ( it->status().isInstalled() )
* {
diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index 180ec75..442c27d 100644
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -227,7 +227,7 @@ namespace zypp
, solver_onlyRequires ( false )
, solver_allowVendorChange ( false )
, solver_upgradeTestcasesToKeep ( 2 )
- , solverUpgradeRemoveDropedPackages( true )
+ , solverUpgradeRemoveDroppedPackages( true )
, apply_locks_file ( true )
{
@@ -357,9 +357,9 @@ namespace zypp
{
solver_upgradeTestcasesToKeep.set( str::strtonum<unsigned>( value ) );
}
- else if ( entry == "solver.upgradeRemoveDropedPackages" )
+ else if ( entry == "solver.upgradeRemoveDroppedPackages" )
{
- solverUpgradeRemoveDropedPackages.restoreToDefault( str::strToBool( value, solverUpgradeRemoveDropedPackages.getDefault() ) );
+ solverUpgradeRemoveDroppedPackages.restoreToDefault( str::strToBool( value, solverUpgradeRemoveDroppedPackages.getDefault() ) );
}
else if ( entry == "solver.checkSystemFile" )
{
@@ -481,7 +481,7 @@ namespace zypp
Option<bool> solver_onlyRequires;
Option<bool> solver_allowVendorChange;
Option<unsigned> solver_upgradeTestcasesToKeep;
- DefaultOption<bool> solverUpgradeRemoveDropedPackages;
+ DefaultOption<bool> solverUpgradeRemoveDroppedPackages;
Pathname solver_checkSystemFile;
@@ -702,9 +702,9 @@ namespace zypp
unsigned ZConfig::solver_upgradeTestcasesToKeep() const
{ return _pimpl->solver_upgradeTestcasesToKeep; }
- bool ZConfig::solverUpgradeRemoveDropedPackages() const { return _pimpl->solverUpgradeRemoveDropedPackages; }
- void ZConfig::setSolverUpgradeRemoveDropedPackages( bool val_r ) { _pimpl->solverUpgradeRemoveDropedPackages.set( val_r ); }
- void ZConfig::resetSolverUpgradeRemoveDropedPackages() { _pimpl->solverUpgradeRemoveDropedPackages.restoreToDefault(); }
+ bool ZConfig::solverUpgradeRemoveDroppedPackages() const { return _pimpl->solverUpgradeRemoveDroppedPackages; }
+ void ZConfig::setSolverUpgradeRemoveDroppedPackages( bool val_r ) { _pimpl->solverUpgradeRemoveDroppedPackages.set( val_r ); }
+ void ZConfig::resetSolverUpgradeRemoveDroppedPackages() { _pimpl->solverUpgradeRemoveDroppedPackages.restoreToDefault(); }
std::set<IdString> ZConfig::multiversion() const
{ return _pimpl->multiversion; }
diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h
index 4c62c72..badb1ec 100644
--- a/zypp/ZConfig.h
+++ b/zypp/ZConfig.h
@@ -259,11 +259,11 @@ namespace zypp
* cleanup manually. Or simply leave them installed as long as you don't
* need the disk space.
*/
- bool solverUpgradeRemoveDropedPackages() const;
- /** Set \ref solverUpgradeRemoveDropedPackages to \a val_r. */
- void setSolverUpgradeRemoveDropedPackages( bool val_r );
- /** Reset \ref solverUpgradeRemoveDropedPackages to the \c zypp.conf default. */
- void resetSolverUpgradeRemoveDropedPackages();
+ bool solverUpgradeRemoveDroppedPackages() const;
+ /** Set \ref solverUpgradeRemoveDroppedPackages to \a val_r. */
+ void setSolverUpgradeRemoveDroppedPackages( bool val_r );
+ /** Reset \ref solverUpgradeRemoveDroppedPackages to the \c zypp.conf default. */
+ void resetSolverUpgradeRemoveDroppedPackages();
/**
* Packages which can be installed parallel with different versions
diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 9e4598f..8751ed6 100644
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -644,7 +644,7 @@ SATResolver::solverInit(const PoolItemList & weakItems)
if ( _distupgrade )
{
- if ( ZConfig::instance().solverUpgradeRemoveDropedPackages() )
+ if ( ZConfig::instance().solverUpgradeRemoveDroppedPackages() )
{
MIL << "Checking droplists ..." << endl;
// Dropped packages: look for 'weakremover()' provides
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org