diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-02-14 18:30:53 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-02-14 18:30:53 +0000 |
| commit | e67988237374fb6181b163a0d2470f367b514c80 (patch) | |
| tree | 0c3b934f340208eda237bbca1d5f31581008d93e /apt-pkg/depcache.cc | |
| parent | 85eeadde2aefeb0bea1eff4dc2456eec8a405d05 (diff) | |
| parent | 9b36a29ffebde3088cec2048505b8d644f46c2c3 (diff) | |
Merge branch 'solver3' into 'main'
Get 3.0 solver mostly in shape
See merge request apt-team/apt!451
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index ef93a54bb..b66f2bc66 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -2496,7 +2496,7 @@ static bool MarkPackage(pkgCache::PkgIterator const &Pkg, // pkgDepCache::MarkRequired - the main mark algorithm /*{{{*/ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) { - if (_config->Find("APT::Solver", "internal") != "internal") + if (_config->Find("APT::Solver", "internal") != "internal" && _config->Find("APT::Solver") != "3.0") return true; // init the states |