From 45432cc57144715109f27d0bb83356b12e2a4ef5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 30 Jan 2025 13:46:09 +0100 Subject: solver3: Remove NewUnsatRecommends group This is more or less unused; but it particularly has the bad problem of forcing new unsat recommends to be solved *before* dependencies. Which is awkward. --- apt-pkg/solver3.cc | 2 -- apt-pkg/solver3.h | 1 - 2 files changed, 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/solver3.cc b/apt-pkg/solver3.cc index b876636c6..ce38d75d8 100644 --- a/apt-pkg/solver3.cc +++ b/apt-pkg/solver3.cc @@ -603,8 +603,6 @@ bool APT::Solver::EnqueueOrGroup(pkgCache::DepIterator start, pkgCache::DepItera return true; } } - else if (workItem.optional && start.ParentPkg()->CurrentVer == 0) - workItem.group = Group::NewUnsatRecommends; if (not workItem.solutions.empty()) { diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h index a643d5d07..c7437f8fb 100644 --- a/apt-pkg/solver3.h +++ b/apt-pkg/solver3.h @@ -46,7 +46,6 @@ class Solver enum class Group : uint8_t { HoldOrDelete, - NewUnsatRecommends, // Satisfying dependencies on entirely new packages first is a good idea because // it may contain replacement packages like libfoo1t64 whereas we later will see -- cgit v1.2.3-70-g09d2