fix status testing, now thing get a bit faster ;-)

diff --git a/zypp/solver/detail/QueueItemConflict.cc b/zypp/solver/detail/QueueItemConflict.cc
index 9e3b603..5cdb008 100644 (file)
--- a/zypp/solver/detail/QueueItemConflict.cc
+++ b/zypp/solver/detail/QueueItemConflict.cc
@@ -192,7 +192,7 @@ struct ConflictProcess : public resfilter::OnCapMatchCallbackFunctor
 
        _XDEBUG("ConflictProcess (provider[" << provider << "]<" << status << ">");
 
-       if (status.isInstalled()
+       if (status.staysInstalled()
            || status.isToBeInstalledSoft())
        {
            ResolverInfo_Ptr log_info;

diff --git a/zypp/solver/detail/QueueItemInstall.cc b/zypp/solver/detail/QueueItemInstall.cc
index 60ab8c4..7a02a9e 100644 (file)
--- a/zypp/solver/detail/QueueItemInstall.cc
+++ b/zypp/solver/detail/QueueItemInstall.cc
@@ -285,7 +285,7 @@ QueueItemInstall::process (ResolverContext_Ptr context, QueueItemList & qil)
 
     // we're done if this isn't currently uninstalled or incomplete
 
-    if (! (status.isUninstalled()
+    if (! (status.staysUninstalled()
           || status.isToBeUninstalledDueToUnlink()
           || status.isIncomplete()
           || status.isSatisfied()))

diff --git a/zypp/solver/detail/QueueItemUninstall.cc b/zypp/solver/detail/QueueItemUninstall.cc
index c002c59..666a535 100644 (file)
--- a/zypp/solver/detail/QueueItemUninstall.cc
+++ b/zypp/solver/detail/QueueItemUninstall.cc
@@ -235,7 +235,7 @@ QueueItemUninstall::process (ResolverContext_Ptr context, QueueItemList & qil)
            goto finished;
 
        }
-       else if (status.isInstalled()) {
+       else if (status.staysInstalled()) {
 
            UnlinkCheck info;
 
@@ -288,7 +288,7 @@ QueueItemUninstall::process (ResolverContext_Ptr context, QueueItemList & qil)
 
     context->uninstall (_item, _upgraded_to /*bool*/, _due_to_obsolete, _unlink);
 
-    if (status.isInstalled()) {
+    if (status.staysInstalled()) {
 
 #warning Needs Locks
 #if 0