diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:48:10 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:48:10 +0000 |
| commit | 7f9ceaec776a597e9ff8451038d57dd75e1e6d18 (patch) | |
| tree | 284aa831d7c1c097a28b9048e594e071efa8e65c /apt-pkg/edsp.cc | |
| parent | Releasing progress-linux version 2.9.3-0.0~progress7.99u1. (diff) | |
| download | apt-7f9ceaec776a597e9ff8451038d57dd75e1e6d18.tar.xz apt-7f9ceaec776a597e9ff8451038d57dd75e1e6d18.zip | |
Merging upstream version 2.9.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | apt-pkg/edsp.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index 5894008..0ffde46 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -770,13 +770,22 @@ bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache, { APT::Solver s(Cache.GetCache(), Cache.GetPolicy()); FileFd output; - if (not s.FromDepCache(Cache)) - return false; - if (not s.Solve()) - return false; - if (not s.ToDepCache(Cache)) - return false; - return true; + bool res = true; + if (Progress != NULL) + Progress->OverallProgress(0, 100, 1, _config->FindB("APT::Solver::Upgrade") ? _("Calculating upgrade") : _("Solving dependencies")); + if (res && not s.FromDepCache(Cache)) + res = false; + if (Progress != NULL) + Progress->Progress(10); + if (res && not s.Solve()) + res = false; + if (Progress != NULL) + Progress->Progress(90); + if (res && not s.ToDepCache(Cache)) + res = false; + if (Progress != NULL) + Progress->Done(); + return res; } if (strcmp(solver, "internal") == 0) { |