diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-06-08 11:34:53 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-06-08 13:09:42 +0200 |
| commit | 3a487cc03dec3488d0fa3008d04747bb1b4b0baf (patch) | |
| tree | f019a4ff447f4c14dfc7748c4ef1bdcd62261428 /apt-pkg/algorithms.cc | |
| parent | 4dc619c0435d44a6a03cfda357654d3d76833b68 (diff) | |
edsp: if logging is requested, do it for internal, too
Create and log the EDSP(like) request even if we use the internal
resolver.
Diffstat (limited to 'apt-pkg/algorithms.cc')
| -rw-r--r-- | apt-pkg/algorithms.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index d202951a9..b173979c3 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -636,8 +636,9 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) bool pkgProblemResolver::Resolve(bool BrokenFix, OpProgress * const Progress) { std::string const solver = _config->Find("APT::Solver", "internal"); + auto const ret = EDSP::ResolveExternal(solver.c_str(), Cache, 0, Progress); if (solver != "internal") - return EDSP::ResolveExternal(solver.c_str(), Cache, 0, Progress); + return ret; return ResolveInternal(BrokenFix); } /*}}}*/ @@ -1133,10 +1134,10 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I) bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress) { std::string const solver = _config->Find("APT::Solver", "internal"); + constexpr auto flags = EDSP::Request::UPGRADE_ALL | EDSP::Request::FORBID_NEW_INSTALL | EDSP::Request::FORBID_REMOVE; + auto const ret = EDSP::ResolveExternal(solver.c_str(), Cache, flags, Progress); if (solver != "internal") - return EDSP::ResolveExternal(solver.c_str(), Cache, - EDSP::Request::UPGRADE_ALL | EDSP::Request::FORBID_NEW_INSTALL | EDSP::Request::FORBID_REMOVE, - Progress); + return ret; return ResolveByKeepInternal(); } /*}}}*/ |