Author: schubi2
Date: Wed Apr 2 13:48:14 2008
New Revision: 9337
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9337&view=rev
Log:
- Moved poolItem.status().isSatisfied(),.... to poolItem.isSatisfied()
- Removed establish state in ResStatus
Modified:
trunk/libzypp/zypp/ResStatus.cc
trunk/libzypp/zypp/ResStatus.h
trunk/libzypp/zypp/sat/SATResolver.cc
Modified: trunk/libzypp/zypp/ResStatus.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.cc?rev=9337&r1=9336&r2=9337&view=diff
==============================================================================
--- trunk/libzypp/zypp/ResStatus.cc (original)
+++ trunk/libzypp/zypp/ResStatus.cc Wed Apr 2 13:48:14 2008
@@ -20,19 +20,14 @@
namespace zypp
{ /////////////////////////////////////////////////////////////////
- const ResStatus ResStatus::toBeInstalled (UNINSTALLED, UNDETERMINED, TRANSACT);
- const ResStatus ResStatus::toBeInstalledSoft (UNINSTALLED, UNDETERMINED, TRANSACT, SOFT_INSTALL);
- const ResStatus ResStatus::toBeUninstalled (INSTALLED, UNDETERMINED, TRANSACT);
- const ResStatus ResStatus::toBeUninstalledSoft (INSTALLED, UNDETERMINED, TRANSACT, EXPLICIT_INSTALL, SOFT_REMOVE);
- const ResStatus ResStatus::toBeUninstalledDueToObsolete(INSTALLED, UNDETERMINED, TRANSACT, EXPLICIT_INSTALL, DUE_TO_OBSOLETE);
- const ResStatus ResStatus::toBeUninstalledDueToUpgrade (INSTALLED, UNDETERMINED, TRANSACT, EXPLICIT_INSTALL, DUE_TO_UPGRADE);
- const ResStatus ResStatus::installed (INSTALLED, UNDETERMINED);
- const ResStatus ResStatus::uninstalled (UNINSTALLED, UNDETERMINED);
- const ResStatus ResStatus::incomplete (INSTALLED, INCOMPLETE);
- const ResStatus ResStatus::complete (INSTALLED, SATISFIED);
- const ResStatus ResStatus::satisfied (UNINSTALLED, SATISFIED);
- const ResStatus ResStatus::unneeded (UNINSTALLED, UNNEEDED);
- const ResStatus ResStatus::needed (UNINSTALLED, INCOMPLETE);
+ const ResStatus ResStatus::toBeInstalled (UNINSTALLED, TRANSACT);
+ const ResStatus ResStatus::toBeInstalledSoft (UNINSTALLED, TRANSACT, SOFT_INSTALL);
+ const ResStatus ResStatus::toBeUninstalled (INSTALLED, TRANSACT);
+ const ResStatus ResStatus::toBeUninstalledSoft (INSTALLED, TRANSACT, EXPLICIT_INSTALL, SOFT_REMOVE);
+ const ResStatus ResStatus::toBeUninstalledDueToObsolete(INSTALLED, TRANSACT, EXPLICIT_INSTALL, DUE_TO_OBSOLETE);
+ const ResStatus ResStatus::toBeUninstalledDueToUpgrade (INSTALLED, TRANSACT, EXPLICIT_INSTALL, DUE_TO_UPGRADE);
+ const ResStatus ResStatus::installed (INSTALLED);
+ const ResStatus ResStatus::uninstalled (UNINSTALLED);
const ResStatus ResStatus::recommended (RECOMMENDED);
const ResStatus ResStatus::suggested (SUGGESTED);
@@ -62,10 +57,9 @@
{}
- ResStatus::ResStatus (enum StateValue s, enum EstablishValue e, enum TransactValue t, enum InstallDetailValue i, enum RemoveDetailValue r, enum SolverStateValue ssv)
+ ResStatus::ResStatus (enum StateValue s, enum TransactValue t, enum InstallDetailValue i, enum RemoveDetailValue r, enum SolverStateValue ssv)
: _bitfield (s)
{
- fieldValueAssign<EstablishField>(e);
fieldValueAssign<TransactField>(t);
if (t == TRANSACT) {
if (s == INSTALLED) fieldValueAssign<TransactDetailField>(r);
@@ -86,10 +80,6 @@
{
str << (obj.isInstalled() ? "I" : "U");
- str << (obj.isEstablishedUneeded() ? "U" :
- ( obj.isEstablishedSatisfied() ? "S" :
- ( obj.isEstablishedIncomplete() ? "I" : "_") ) );
-
str << (obj.transacts () ? "T"
: (obj.isLocked() ? "L" : "_") );
Modified: trunk/libzypp/zypp/ResStatus.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=9337&r1=9336&r2=9337&view=diff
==============================================================================
--- trunk/libzypp/zypp/ResStatus.h (original)
+++ trunk/libzypp/zypp/ResStatus.h Wed Apr 2 13:48:14 2008
@@ -27,12 +27,6 @@
/** Status bitfield.
*
* \li \c StateField Whether the resolvable is or uninstalled (available).
- * \li \c EstablishField Established status computed by the solver as
- * unneeded (have freshens but none of them trigger)
- * satisfied (no freshen or at least one triggered freshen and
- * all requires fulfilled)
- * or incomplete (no freshen or at least one triggered freshen and
- * NOT all requires fulfilled)
* \li \c TransactField Wheter to transact this resolvable
* (delete if installed install if uninstalled).
* In case the resolvable is locked, only USER may modify the
@@ -62,8 +56,7 @@
typedef bit::BitField<FieldType> BitFieldType;
// Bit Ranges within FieldType defined by 1st bit and size:
typedef bit::Range