Remove deprecated virtualconflicts flag.

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index d980deeb664536360b1aa359313b0bbeacb5b994..90a638880c27903798a8f044fa3d29902d4640cf 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -269,7 +269,6 @@ void Resolver::solverInit()
     _satResolver->setAllowvendorchange         ( allowVendorChange() );
     _satResolver->setAllowuninstall            ( forceResolve() );
     _satResolver->setUpdatesystem              (false);
-    _satResolver->setAllowvirtualconflicts     (false);
     _satResolver->setNoupdateprovide           (false);
     _satResolver->setDosplitprovides           (false);
     _satResolver->setSolveSrcPackages          ( solveSrcPackages() );

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 3cfd60437cbe0e6127085e8759d16204e8f5e5f7..7524b4aa1cd6bdf369a6061340e01d09dbf28d68 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -116,7 +116,6 @@ SATResolver::dumpOn( std::ostream & os ) const
        os << "  allowvendorchange = " <<  _solv->allowvendorchange << endl;
        os << "  allowuninstall = " << _solv->allowuninstall << endl;
        os << "  updatesystem = " << _solv->updatesystem << endl;
-       os << "  allowvirtualconflicts = " <<  _solv->allowvirtualconflicts << endl;
        os << "  noupdateprovide = " << _solv->noupdateprovide << endl;
        os << "  dosplitprovides = " << _solv->dosplitprovides << endl;
        os << "  onlyRequires = " << _solv->dontinstallrecommended << endl;
@@ -142,7 +141,6 @@ SATResolver::SATResolver (const ResPool & pool, Pool *SATPool)
     , _allowvendorchange(false)
     , _allowuninstall(false)
     , _updatesystem(false)
-    , _allowvirtualconflicts(false)
     , _noupdateprovide(false)
     , _dosplitprovides(false)
     , _onlyRequires(ZConfig::instance().solver_onlyRequires())
@@ -422,7 +420,6 @@ SATResolver::solving(const CapabilitySet & requires_caps,
     _solv->allowuninstall = _allowuninstall;
     _solv->allowarchchange = _allowarchchange;
     _solv->allowvendorchange = _allowvendorchange;
-    _solv->allowvirtualconflicts = _allowvirtualconflicts;
     _solv->dosplitprovides = _dosplitprovides;
     _solv->noupdateprovide = _noupdateprovide;
     _solv->dontinstallrecommended = _onlyRequires;

diff --git a/zypp/solver/detail/SATResolver.h b/zypp/solver/detail/SATResolver.h
index 144816d7181ccb92249ca549c698e93b727d91ae..5cb5aba7c1c1ea2e46aea064221c72a31734dc13 100644 (file)
--- a/zypp/solver/detail/SATResolver.h
+++ b/zypp/solver/detail/SATResolver.h
@@ -88,7 +88,6 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable {
     bool _allowvendorchange;           // allow to change vendor of installed solvables
     bool _allowuninstall;              // allow removal of installed solvables
     bool _updatesystem;                        // update
-    bool _allowvirtualconflicts;       // false: conflicts on package name, true: conflicts on package provides
     bool _noupdateprovide;             // true: update packages needs not to provide old package
     bool _dosplitprovides;             // true: consider legacy split provides
     bool _onlyRequires;                        // true: consider required packages only
@@ -187,9 +186,6 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable {
     bool updatesystem () const {return _updatesystem;}
     void setUpdatesystem ( const bool updatesystem) { _updatesystem = updatesystem;}
 
-    bool allowvirtualconflicts () const {return _allowvirtualconflicts;}
-    void setAllowvirtualconflicts ( const bool allowvirtualconflicts) { _allowvirtualconflicts = allowvirtualconflicts;}
-
     bool noupdateprovide () const {return _noupdateprovide;}
     void setNoupdateprovide ( const bool noupdateprovide) { _noupdateprovide = noupdateprovide;}