Imported Upstream version 16.3.2

[platform/upstream/libzypp.git] / zypp / ui / Selectable.cc

diff --git a/zypp/ui/Selectable.cc b/zypp/ui/Selectable.cc
index 153c8d4..e8678e8 100644 (file)
--- a/zypp/ui/Selectable.cc
+++ b/zypp/ui/Selectable.cc
@@ -55,7 +55,7 @@ namespace zypp
     IdString Selectable::ident() const
     { return _pimpl->ident(); }
 
-    ResObject::Kind Selectable::kind() const
+    ResKind Selectable::kind() const
     { return _pimpl->kind(); }
 
     const std::string & Selectable::name() const
@@ -64,7 +64,7 @@ namespace zypp
     Status Selectable::status() const
     { return _pimpl->status(); }
 
-    bool Selectable::setStatus( const Status state_r, ResStatus::TransactByValue causer_r )
+    bool Selectable::setStatus( Status state_r, ResStatus::TransactByValue causer_r )
     { return _pimpl->setStatus( state_r, causer_r ); }
 
     PoolItem Selectable::installedObj() const
@@ -88,6 +88,12 @@ namespace zypp
     bool Selectable::identicalInstalled( const PoolItem & rhs ) const
     { return _pimpl->identicalInstalled( rhs ); }
 
+    PoolItem Selectable::identicalAvailableObj( const PoolItem & rhs ) const
+    { return _pimpl->identicalAvailableObj( rhs ); }
+
+    PoolItem Selectable::identicalInstalledObj( const PoolItem & rhs ) const
+    { return _pimpl->identicalInstalledObj( rhs ); }
+
     PoolItem Selectable::setCandidate( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r )
     { return _pimpl->setCandidate( newCandidate_r, causer_r ); }
 
@@ -163,6 +169,9 @@ namespace zypp
     Status Selectable::pickStatus( const PoolItem & pi_r ) const
     { return _pimpl->pickStatus( pi_r ); }
 
+    bool Selectable::setPickStatus( const PoolItem & pi_r, Status state_r, ResStatus::TransactByValue causer_r )
+    { return _pimpl->setPickStatus( pi_r, state_r, causer_r ); }
+
     ////////////////////////////////////////////////////////////////////////
 
     bool Selectable::isUndetermined() const
@@ -179,7 +188,12 @@ namespace zypp
 
     bool Selectable::isNeeded() const
     {
-      return fate() == TO_INSTALL || isBroken() ;
+      return fate() == TO_INSTALL || ( ! locked() && isBroken() );
+    }
+
+    bool Selectable::isUnwanted() const
+    {
+      return locked() && isBroken() ;
     }
 
     ResStatus::TransactByValue Selectable::modifiedBy() const