Imported Upstream version 17.8.0

[platform/upstream/libzypp.git] / zypp / Resolver.cc

diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc
index 8c02fac..07f90d8 100644 (file)
--- a/zypp/Resolver.cc
+++ b/zypp/Resolver.cc
@@ -86,6 +86,10 @@ namespace zypp
   void Resolver::setIgnoreAlreadyRecommended( bool yesno_r) { _pimpl->setIgnoreAlreadyRecommended( yesno_r ); }
   bool Resolver::ignoreAlreadyRecommended() const      { return _pimpl->ignoreAlreadyRecommended(); }
 
+  void Resolver::setInr( ResolverNamespaces namespaces_r ) { _pimpl->setInr( namespaces_r ); }
+  void Resolver::resetInr()                            { setInr( ResolverNamespaces() ); }
+  ResolverNamespaces Resolver::inr() const             { return _pimpl->inr(); }
+
   void Resolver::setOnlyRequires( bool yesno_r )       { _pimpl->setOnlyRequires( yesno_r ); }
   void Resolver::resetOnlyRequires()                   { _pimpl->setOnlyRequires( indeterminate ); }
   bool Resolver::onlyRequires() const                  { return _pimpl->onlyRequires(); }
@@ -93,9 +97,8 @@ namespace zypp
   void Resolver::setUpgradeMode( bool yesno_r )                { return _pimpl->setUpgradeMode( yesno_r ); }
   bool Resolver::upgradeMode() const                   { return _pimpl->isUpgradeMode(); }
 
-  void Resolver::setAllowVendorChange( bool yesno_r )  { _pimpl->setAllowVendorChange( yesno_r ); }
-  void Resolver::setDefaultAllowVendorChange()         { _pimpl->setAllowVendorChange( indeterminate ); }
-  bool Resolver::allowVendorChange() const             { return _pimpl->allowVendorChange(); }
+  void Resolver::setUpdateMode( bool yesno_r )         { return _pimpl->setUpdateMode( yesno_r ); }
+  bool Resolver::updateMode() const                    { return _pimpl->isUpdateMode(); }
 
   void Resolver::setSystemVerification( bool yesno_r ) { _pimpl->setVerifyingMode( yesno_r ); }
   void Resolver::setDefaultSystemVerification()                { _pimpl->setVerifyingMode( indeterminate ); }
@@ -117,6 +120,11 @@ namespace zypp
   ZOLV_FLAG_BOOL( ZSETTER , ZGETTER )                                          \
   void Resolver::ZDEFAULT()            { _pimpl->ZSETTER( indeterminate ); }   \
 
+  ZOLV_FLAG_TRIBOOL( setAllowDowngrade,                setDefaultAllowDowngrade,       allowDowngrade )
+  ZOLV_FLAG_TRIBOOL( setAllowNameChange,       setDefaultAllowNameChange,      allowNameChange )
+  ZOLV_FLAG_TRIBOOL( setAllowArchChange,       setDefaultAllowArchChange,      allowArchChange )
+  ZOLV_FLAG_TRIBOOL( setAllowVendorChange,     setDefaultAllowVendorChange,    allowVendorChange )
+
   ZOLV_FLAG_TRIBOOL( dupSetAllowDowngrade,     dupSetDefaultAllowDowngrade,    dupAllowDowngrade )
   ZOLV_FLAG_TRIBOOL( dupSetAllowNameChange,    dupSetDefaultAllowNameChange,   dupAllowNameChange )
   ZOLV_FLAG_TRIBOOL( dupSetAllowArchChange,    dupSetDefaultAllowArchChange,   dupAllowArchChange )