summaryrefslogtreecommitdiff
path: root/apt-pkg/edsp.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-02-11 12:11:20 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2025-02-14 19:08:45 +0100
commit4c48b5618ba15d4e33625cec81843891910e81a2 (patch)
tree5842b632b56cae8debd582c9a9870feeee4d2f57 /apt-pkg/edsp.cc
parent9b8aaaa7abbf36d937dbf7160caa2d9c7c92871f (diff)
solver3: Defer 3.0 'deep' autoremoval to 3.1, fix autoremove
Restore the depcache's MarkRequired logic for 3.0 solver; and change the MarkInstall() call to pass a more correct value for FromUser, to not override an existing automatic status.
Diffstat (limited to 'apt-pkg/edsp.cc')
-rw-r--r--apt-pkg/edsp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 88f572f18..dd9ae18fc 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -754,7 +754,7 @@ static bool CreateDumpFile(char const * const id, char const * const type, FileF
// EDSP::ResolveExternal - resolve problems by asking external for help {{{*/
bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache,
unsigned int const flags, OpProgress *Progress) {
- if (strcmp(solver, "3.0") == 0)
+ if (strstr(solver, "3.") == solver)
{
APT::Solver s(Cache.GetCache(), Cache.GetPolicy());
FileFd output;