ref: refs/heads/master
commit 8d3fcead247b2d4b2a240d3b24b92bc93fbe84cd
Author: Michael Andres
Date: Wed Feb 18 00:31:27 2009 +0100
remove unused 'DueToObsolete' from ResStatus
---
zypp/ResStatus.cc | 5 ++---
zypp/ResStatus.h | 13 +------------
zypp/pool/GetResolvablesToInsDel.cc | 6 +-----
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/zypp/ResStatus.cc b/zypp/ResStatus.cc
index 482d766..b3daad0 100644
--- a/zypp/ResStatus.cc
+++ b/zypp/ResStatus.cc
@@ -86,9 +86,8 @@ namespace zypp
else if (obj.isByApplHigh()) str << "h";
else if (obj.isByUser()) str << "u";
- str << (obj.isToBeUninstalledDueToObsolete() ? "O" :
- ( obj.isToBeUninstalledDueToUpgrade() ? "U" :
- ( obj.isToBeInstalledSoft() ? "S" : "_" ) ) );
+ str << (obj.isToBeUninstalledDueToUpgrade() ? "U" :
+ ( obj.isToBeInstalledSoft() ? "S" : "_" ) );
str << (obj.isSeen() ? "@" : "" );
diff --git a/zypp/ResStatus.h b/zypp/ResStatus.h
index c0ff1ba..8b3b405 100644
--- a/zypp/ResStatus.h
+++ b/zypp/ResStatus.h
@@ -126,8 +126,7 @@ namespace zypp
{
EXPLICIT_REMOVE = bit::RangeValue::value,
SOFT_REMOVE = bit::RangeValue::value,
- DUE_TO_OBSOLETE = bit::RangeValue::value,
- DUE_TO_UPGRADE = bit::RangeValue::value
+ DUE_TO_UPGRADE = bit::RangeValue::value
};
enum SolverStateValue
{
@@ -300,9 +299,6 @@ namespace zypp
return false;
}
}
-
- bool isToBeUninstalledDueToObsolete () const
- { return isToBeUninstalled() && fieldValueIs<TransactDetailField>( DUE_TO_OBSOLETE ); }
bool isToBeUninstalledDueToUpgrade() const
{ return isToBeUninstalled() && fieldValueIs<TransactDetailField>( DUE_TO_UPGRADE ); }
@@ -544,13 +540,6 @@ namespace zypp
//------------------------------------------------------------------------
// *** These are only for the Resolver ***
- bool setToBeUninstalledDueToObsolete ( )
- {
- if (!setToBeUninstalled (SOLVER)) return false;
- fieldValueAssign<TransactDetailField>(DUE_TO_OBSOLETE);
- return true;
- }
-
bool setToBeUninstalledDueToUpgrade ( TransactByValue causer )
{
if (!setToBeUninstalled (causer)) return false;
diff --git a/zypp/pool/GetResolvablesToInsDel.cc b/zypp/pool/GetResolvablesToInsDel.cc
index 2389382..63eb576 100644
--- a/zypp/pool/GetResolvablesToInsDel.cc
+++ b/zypp/pool/GetResolvablesToInsDel.cc
@@ -87,11 +87,7 @@ namespace zypp
}
else if (it->status().isToBeUninstalled())
{
- if ( it->status().isToBeUninstalledDueToObsolete() )
- {
- DBG << "Ignore auto_delete (should be obsoleted): " << *it << endl;
- }
- else if ( it->status().isToBeUninstalledDueToUpgrade() )
+ if( it->status().isToBeUninstalledDueToUpgrade() )
{
DBG << "Ignore auto_delete (should be upgraded): " << *it << endl;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
Michael Andres