ref: refs/heads/master
commit cd282a79aef426c9803f7e6e441a291797dd00f8
Author: Michael Andres
Date: Thu Jun 4 12:16:33 2009 +0200
Remove deprecated virtualconflicts flag.
---
zypp/solver/detail/Resolver.cc | 1 -
zypp/solver/detail/SATResolver.cc | 3 ---
zypp/solver/detail/SATResolver.h | 4 ----
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index d980dee..90a6388 100644
--- 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 3cfd604..7524b4a 100644
--- 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 144816d..5cb5aba 100644
--- 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;}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
