From 43c71fad3a51d841132ba15a7a5930e1ee4126ed Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 6 May 2016 14:21:02 +0200 Subject: edsp: add Forbid-{New-Install,Remove} and Upgrade-All This allows to differentiate properly between 'apt-get upgrade', 'apt upgrade' and 'apt full-upgrade'. --- apt-pkg/algorithms.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apt-pkg/algorithms.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index fbc809ed0..d202951a9 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -637,7 +637,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix, OpProgress * const Progress) { std::string const solver = _config->Find("APT::Solver", "internal"); if (solver != "internal") - return EDSP::ResolveExternal(solver.c_str(), Cache, false, false, false, Progress); + return EDSP::ResolveExternal(solver.c_str(), Cache, 0, Progress); return ResolveInternal(BrokenFix); } /*}}}*/ @@ -1134,7 +1134,9 @@ bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress) { std::string const solver = _config->Find("APT::Solver", "internal"); if (solver != "internal") - return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, Progress); + return EDSP::ResolveExternal(solver.c_str(), Cache, + EDSP::Request::UPGRADE_ALL | EDSP::Request::FORBID_NEW_INSTALL | EDSP::Request::FORBID_REMOVE, + Progress); return ResolveByKeepInternal(); } /*}}}*/ -- cgit v1.2.3