Merge branch 'solver3' into 'main'

Enable the new solver by default in 0.31, 1.21, 2.11, 3.1

See merge request apt-team/apt!527

17 files changed, 103 insertions, 49 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42d1b6a58..8b8535311 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test as root:
     - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
     - unbuffer ./test/integration/run-tests -q -j 4
 
-test solver3 and gpgv:
+test classic solver and gpgv:
   stage: test
   variables:
     APT_CMAKE_BUILD_OPTIONS: '-DWITH_DOC=OFF -DUSE_NLS=OFF'
@@ -39,7 +39,7 @@ test solver3 and gpgv:
     BUILD_PRE: 'rm /usr/bin/sqv'
   script:
     - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
-    - unbuffer ./test/integration/run-tests -q -j 4 --solver 3.0 --skip solver3.broken
+    - unbuffer ./test/integration/run-tests -q -j 4 --solver internal
 
 test as user:
   image:
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index f7f508f85..09d7a93bc 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1853,6 +1853,10 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg,
       if (CV.Downloadable() == false)
 	 continue;
 
+      // Ignore siblings marked for deletion
+      if (PkgState[P->ID].Delete())
+	 continue;
+
       PkgState[Pkg->ID].iFlags |= AutoKept;
       if (unlikely(DebugMarker == true))
 	 std::clog << OutputInDepth(Depth) << "Ignore MarkInstall of " << APT::PrettyPkg(this, Pkg)
diff --git a/apt-pkg/solver3.cc b/apt-pkg/solver3.cc
index 65e3940b4..4d7e0ff0b 100644
--- a/apt-pkg/solver3.cc
+++ b/apt-pkg/solver3.cc
@@ -1007,6 +1007,7 @@ void APT::Solver::UndoOne()
       auto &state = (*this)[solvedItem.assigned];
       state.decision = Decision::NONE;
       state.reason = nullptr;
+      state.reasonStr = nullptr;
       state.depth = 0;
    }
 
@@ -1071,6 +1072,8 @@ bool APT::Solver::Pop()
    if (not choice.empty() && not Enqueue(choice, false, {}))
       return false;
 
+   (*this)[choice].reasonStr = "backtracked";
+
    if (unlikely(debug >= 2))
       std::cerr << "Backtracked to choice " << choice.toString(cache) << "\n";
 
@@ -1366,7 +1369,8 @@ bool APT::Solver::ToDepCache(pkgDepCache &depcache) const
       }
       else if (P->CurrentVer || depcache[P].Install())
       {
-	 depcache.MarkDelete(P, false, 0, not(*this)[P].reason);
+	 bool automatic = (not (*this)[P].reason) && (not (*this)[P].reasonStr);
+	 depcache.MarkDelete(P, false, 0, automatic);
 	 depcache[P].Marked = 0;
 	 depcache[P].Garbage = 1;
       }
diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h
index 8d834b313..45b55d962 100644
--- a/apt-pkg/solver3.h
+++ b/apt-pkg/solver3.h
@@ -237,7 +237,7 @@ class Solver
    // \brief If set, removals are allowed.
    bool AllowRemove{_config->FindB("APT::Solver::Remove", not(requestFlags & EDSP::Request::FORBID_REMOVE))};
    // \brief If set, removal of manual packages is allowed.
-   bool AllowRemoveManual{AllowRemove && _config->FindB("APT::Solver::RemoveManual", false)};
+   bool AllowRemoveManual{AllowRemove && _config->FindB("APT::Solver::RemoveManual", true)};
    // \brief If set, installs are allowed.
    bool AllowInstall{_config->FindB("APT::Solver::Install", not(requestFlags & EDSP::Request::FORBID_NEW_INSTALL))};
    // \brief If set, we use strict pinning.
@@ -477,6 +477,8 @@ struct APT::Solver::State
    // Vars < 0 are package ID, reasons > 0 are version IDs.
    const Clause *reason{};
 
+   const char *reasonStr{};
+
    // \brief The depth at which the decision has been taken
    depth_type depth{0};
 
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 2e6b47b11..7ea18782c 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -514,6 +514,10 @@ static void BinarySpecificConfiguration(char const * const Binary)	/*{{{*/
    _config->CndSet("Version::1.5::APT::Get::Update::InteractiveReleaseInfoChanges", true);
    _config->CndSet("Version::2.0::APT::Cmd::Pattern-Only", true);
    _config->CndSet("Version::3.0::Pager", true);
+   _config->CndSet("Version::0.31::APT::Solver", "3.0");
+   _config->CndSet("Version::1.21::APT::Solver", "3.0");
+   _config->CndSet("Version::2.11::APT::Solver", "3.0");
+   _config->CndSet("Version::3.1::APT::Solver", "3.0");
 
    if (isatty(STDIN_FILENO))
       _config->CndSet("Version::2.0::Dpkg::Lock::Timeout", -1);
diff --git a/debian/NEWS b/debian/NEWS
index 7ac58d84a..8cb5916ee 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,5 +1,7 @@
 apt (3.1.10) unstable; urgency=medium
 
+  The new solver is now the default.
+
   The new --cli-version optionr equests a specific CLI version.
 
   The default --cli-version is the current APT version for the apt(8) command
diff --git a/test/integration/run-tests b/test/integration/run-tests
index 9399f28e9..f5f6b6c57 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -2,6 +2,8 @@
 set -e
 
 TESTTORUN=''
+export APT_SOLVER="${APT_SOLVER:-3.0}"
+export APT_SKIP_TEST_FILE="${APT_SKIP_TEST_FILE:-solver3.broken}"
 while [ -n "$1" ]; do
 	if [ "$1" = "-q" ]; then
 		export MSGLEVEL=2
@@ -24,6 +26,7 @@ while [ -n "$1" ]; do
 		shift
 	elif [ "$1" = '--solver' ]; then
 		export APT_SOLVER="$2"
+		unset APT_SKIP_TEST_FILE
 		shift
 	elif [ "$1" = '--skip' ]; then
 		export APT_SKIP_TEST_FILE="$2"
diff --git a/test/integration/test-apt-never-markauto-sections b/test/integration/test-apt-never-markauto-sections
index bf08507d0..14ce3ae5a 100755
--- a/test/integration/test-apt-never-markauto-sections
+++ b/test/integration/test-apt-never-markauto-sections
@@ -60,7 +60,7 @@ testfailuremsg 'E: Unable to satisfy dependencies. Reached two conflicting decis
         - texteditor:amd64 is selected for removal
    2. bad-texteditor:amd64 Depends texteditor
       but none of the choices are installable:
-      - texteditor:amd64 is selected for removal' aptget autoremove texteditor -s --solver 3.0 #-o Debug::pkgDepCache::AutoInstall=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::Marker=1
+      - texteditor:amd64 is selected for removal' aptget autoremove texteditor -s --solver 3.0 -o APT::Solver::RemoveManual=0 #-o Debug::pkgDepCache::AutoInstall=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::Marker=1
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -69,7 +69,7 @@ The following packages will be REMOVED:
 0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded.
 Remv mydesktop [1]
 Remv mydesktop-core [1]
-Remv texteditor [1]' aptget autoremove texteditor -s --solver internal #-o Debug::pkgDepCache::AutoInstall=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::Marker=1
+Remv texteditor [1]' aptget autoremove texteditor -s  #-o Debug::pkgDepCache::AutoInstall=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::Marker=1
 testsuccess aptget autoremove texteditor -y --solver internal
 
 testdpkgnotinstalled mydesktop mydesktop-core texteditor
diff --git a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
index b3f11956b..a87481302 100755
--- a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
+++ b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
@@ -13,8 +13,8 @@ testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decis
    2. postfix:i386=2.7.1-1 is not selected for install because:
       1. exim4-daemon-light:i386 is selected for install
       2. exim4-daemon-light:i386 Conflicts mail-transport-agent
-         [selected exim4-daemon-light:i386]" aptget install postfix --solver 3.0
-allowremovemanual
+         [selected exim4-daemon-light:i386]" aptget install postfix --solver 3.0 -o APT::Solver::RemoveManual=0 -s
+
 testfailureequal "Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade
index 00bc9ac2d..ced55a5bf 100755
--- a/test/integration/test-bug-612557-garbage-upgrade
+++ b/test/integration/test-bug-612557-garbage-upgrade
@@ -26,7 +26,7 @@ testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decis
    2. openoffice.org-common:i386=1:3.2.1-11+squeeze2 is selected for install because:
       1. openoffice.org-emailmerge:i386 is selected for install
       2. openoffice.org-emailmerge:i386 PreDepends openoffice.org-common
-      3. openoffice.org-common:i386 is available in version 1:3.2.1-11+squeeze2" aptget --trivial-only install python-uno --solver 3.0
+      3. openoffice.org-common:i386 is available in version 1:3.2.1-11+squeeze2" aptget --trivial-only install python-uno --solver 3.0 -o APT::Solver::RemoveManual=false
 testfailureequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -41,7 +41,7 @@ The following packages will be upgraded:
 1 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
 Need to get 0 B/84 B of archives.
 After this operation, 53.2 MB disk space will be freed.
-E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno --solver internal
+E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
 
 testsuccess aptmark markauto openoffice.org-emailmerge
 testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge
diff --git a/test/integration/test-bug-618848-always-respect-user-requests b/test/integration/test-bug-618848-always-respect-user-requests
index b1cccef9d..6dd77af58 100755
--- a/test/integration/test-bug-618848-always-respect-user-requests
+++ b/test/integration/test-bug-618848-always-respect-user-requests
@@ -18,8 +18,8 @@ testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decis
    1. exim4-daemon-light:i386 is selected for install
    2. exim4-daemon-light:i386 Depends libdb4.8
       but none of the choices are installable:
-      - libdb4.8:i386 is selected for removal" aptget remove libdb4.8 --solver 3.0 -s
-allowremovemanual
+      - libdb4.8:i386 is selected for removal" aptget remove libdb4.8 --solver 3.0 -o APT::Solver::RemoveManual=0 -s
+
 testsuccessequal "Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold
index cfb241614..8e2083602 100755
--- a/test/integration/test-bug-64141-install-dependencies-for-on-hold
+++ b/test/integration/test-bug-64141-install-dependencies-for-on-hold
@@ -31,11 +31,15 @@ The following packages will be upgraded:
 1 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
 Need to get 0 B/42 B of archives.
 After this operation, 0 B of additional disk space will be used.
-E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only --solver 3.0
+E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only --solver 3.0 -o APT::Solver::RemoveManual=0
 
-testfailure aptget dist-upgrade --trivial-only --solver 3.0 -o debug::apt::solver=2
+testfailure aptget dist-upgrade --trivial-only --solver 3.0 -o debug::apt::solver=2 -o APT::Solver::RemoveManual=0
 testsuccess grep -Fx "[0] Reject:apt:$native=0.8.10 (oldcrap:$native -> oldcrap:$native=1-1)" rootdir/tmp/testfailure.output
 
+testfailure aptget dist-upgrade --trivial-only --solver 3.0 -o debug::apt::solver=2 -o APT::Solver::RemoveManual=1
+testsuccess grep -Fx "[2] Reject:apt:$native=0.8.10 (oldcrap:$native -> oldcrap:$native=1-1)" rootdir/tmp/testfailure.output
+
+
 testsuccess aptmark auto ~i
 
 testfailureequal 'Reading package lists...
diff --git a/test/integration/test-bug-961266-hold-means-hold b/test/integration/test-bug-961266-hold-means-hold
index 750d32968..08c74e052 100755
--- a/test/integration/test-bug-961266-hold-means-hold
+++ b/test/integration/test-bug-961266-hold-means-hold
@@ -136,19 +136,16 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  git-ng : Depends: git (> 1:2.26.2)
 E: Unable to satisfy dependencies. Reached two conflicting decisions:
-   1. git:amd64=1:2.26.2-1 is selected as an upgrade because:
-      1. git-ng:amd64=1:2.26.2-1 is selected for install
-      2. git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.)
-         [selected git-ng:amd64]
-      For context, additional choices that could not be installed:
-      * In git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.):
-        - git:i386=1:2.26.2-1 is not selected for install because:
-          1. git:amd64 is selected for install
-          2. git:amd64 Conflicts git:i386
-   2. git:amd64=1:2.26.2-1 is not selected for install because:
-      1. git-cvs:amd64=1:2.25.1-1 is selected for install
-      2. git-cvs:amd64=1:2.25.1-1 Depends git (> 1:2.25.1) and Depends git (< 1:2.25.1-.)
-      3. git:amd64=1:2.25.1-1 conflicts with other versions of itself' apt install git-ng -s --solver 3.0
+   1. git-ng:amd64=1:2.26.2-1 is selected for install
+   2. git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.)
+      but none of the choices are installable:
+      - git:amd64=1:2.26.2-1 is not selected for install because:
+        1. git-cvs:amd64=1:2.25.1-1 is selected for install
+        2. git-cvs:amd64=1:2.25.1-1 Depends git (> 1:2.25.1) and Depends git (< 1:2.25.1-.)
+        3. git:amd64=1:2.25.1-1 conflicts with other versions of itself
+      - git:i386=1:2.26.2-1 is not selected for install because:
+        1-2. git:amd64=1:2.25.1-1 is selected for install as above
+        3. git:amd64 Conflicts git:i386' apt install git-ng -s --solver 3.0
 
 
 msgmsg 'Now mix it up by' 'holding both'
diff --git a/test/integration/test-dpkg-i-apt-install-fix-broken b/test/integration/test-dpkg-i-apt-install-fix-broken
index 252933184..0fa542d9e 100755
--- a/test/integration/test-dpkg-i-apt-install-fix-broken
+++ b/test/integration/test-dpkg-i-apt-install-fix-broken
@@ -35,6 +35,30 @@ The following NEW packages will be installed:
 1 not fully installed or removed.
 Inst debhelper (1 stable [all])
 Conf debhelper (1 stable [all])
+Conf autopkgtest-satdep (1 stable [amd64])' apt install -fso Debug::APT::Solver=1 --solver 3.0 -o APT::Solver::RemoveManual=0
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+Correcting dependencies...Install autopkgtest-satdep:amd64 ()
+[1] Install:autopkgtest-satdep:amd64 ()
+[1] Install:autopkgtest-satdep:amd64=1 (autopkgtest-satdep:amd64)
+[1] Install:debhelper:amd64=1 (autopkgtest-satdep:amd64)
+[1] Install:debhelper:amd64 (autopkgtest-satdep:amd64 -> debhelper:amd64=1)
+ Done
+Solving dependencies...Install debhelper:amd64 (M)
+Install autopkgtest-satdep:amd64 ()
+[1] Install:autopkgtest-satdep:amd64 ()
+[1] Install:autopkgtest-satdep:amd64=1 (autopkgtest-satdep:amd64)
+[1] Install:debhelper:amd64=1 (autopkgtest-satdep:amd64)
+[1] Install:debhelper:amd64 (autopkgtest-satdep:amd64 -> debhelper:amd64=1)
+
+The following additional packages will be installed:
+  debhelper
+The following NEW packages will be installed:
+  debhelper
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+1 not fully installed or removed.
+Inst debhelper (1 stable [all])
+Conf debhelper (1 stable [all])
 Conf autopkgtest-satdep (1 stable [amd64])' apt install -fso Debug::APT::Solver=1 --solver 3.0
 testsuccessequal 'Reading package lists...
 Building dependency tree...
diff --git a/test/integration/test-solver3-show-version-selection b/test/integration/test-solver3-show-version-selection
index c4d23eccf..de81a303f 100755
--- a/test/integration/test-solver3-show-version-selection
+++ b/test/integration/test-solver3-show-version-selection
@@ -14,6 +14,27 @@ insertpackage 'installed,unstable' 'libgcc-s1' 'amd64' '14.2.0-18' 'Multi-Arch:
 
 setupaptarchive
 
+testsuccessequal "Reading package lists...
+Building dependency tree...
+Solving dependencies...
+The following additional packages will be installed:
+  libc6:s390x libgcc-s1:s390x libgstreamer1.0-dev:s390x
+The following packages will be REMOVED:
+  libgcc-s1
+The following NEW packages will be installed:
+  libc6:s390x libgcc-s1:s390x libgstreamer1.0-dev:s390x
+  sbuild-build-depends-main-dummy:s390x
+0 upgraded, 4 newly installed, 1 to remove and 0 not upgraded.
+Remv libgcc-s1 [14.2.0-18]
+Inst libgcc-s1:s390x (14.2.0-17 unstable [s390x])
+Inst libc6:s390x (14.2.0-17 unstable [s390x])
+Inst libgstreamer1.0-dev:s390x (1.25.90-2 unstable [s390x])
+Inst sbuild-build-depends-main-dummy:s390x (0.invalid.0 unstable [s390x])
+Conf libgcc-s1:s390x (14.2.0-17 unstable [s390x])
+Conf libc6:s390x (14.2.0-17 unstable [s390x])
+Conf libgstreamer1.0-dev:s390x (1.25.90-2 unstable [s390x])
+Conf sbuild-build-depends-main-dummy:s390x (0.invalid.0 unstable [s390x])" apt install sbuild-build-depends-main-dummy --solver 3.0 -s
+
 testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decisions:
    1. libc6:s390x is selected for install because:
       1. sbuild-build-depends-main-dummy:s390x=0.invalid.0 is selected for install
@@ -24,5 +45,4 @@ testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decis
       - libgcc-s1:s390x is not selected for install because:
         1. libgcc-s1:amd64 is selected for install
         2. libgcc-s1:amd64 is available in version 14.2.0-18
-        3. libgcc-s1:s390x Breaks libgcc-s1 (!= 14.2.0-17)" apt install sbuild-build-depends-main-dummy --solver 3.0
-
+        3. libgcc-s1:s390x Breaks libgcc-s1 (!= 14.2.0-17)" apt install sbuild-build-depends-main-dummy --solver 3.0 -o APT::Solver::RemoveManual=0 -s
diff --git a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies
index b63991aa4..4d32c0130 100755
--- a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies
+++ b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies
@@ -130,19 +130,16 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  git-ng : Depends: git (> 1:2.26.2)
 E: Unable to satisfy dependencies. Reached two conflicting decisions:
-   1. git:amd64=1:2.26.2-1 is selected as an upgrade because:
-      1. git-ng:amd64=1:2.26.2-1 is selected for install
-      2. git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.)
-         [selected git-ng:amd64]
-      For context, additional choices that could not be installed:
-      * In git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.):
-        - git:i386=1:2.26.2-1 is not selected for install because:
-          1. git:amd64 is selected for install
-          2. git:amd64 Conflicts git:i386
-   2. git:amd64=1:2.26.2-1 is not selected for install because:
-      1. git-cvs:amd64=1:2.25.1-1 is selected for install
-      2. git-cvs:amd64=1:2.25.1-1 Depends git (> 1:2.25.1) and Depends git (< 1:2.25.1-.)
-      3. git:amd64=1:2.25.1-1 conflicts with other versions of itself' apt install git-ng -s
+   1. git-ng:amd64=1:2.26.2-1 is selected for install
+   2. git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.)
+      but none of the choices are installable:
+      - git:amd64=1:2.26.2-1 is not selected for install because:
+        1. git-cvs:amd64=1:2.25.1-1 is selected for install
+        2. git-cvs:amd64=1:2.25.1-1 Depends git (> 1:2.25.1) and Depends git (< 1:2.25.1-.)
+        3. git:amd64=1:2.25.1-1 conflicts with other versions of itself
+      - git:i386=1:2.26.2-1 is not selected for install because:
+        1-2. git:amd64=1:2.25.1-1 is selected for install as above
+        3. git:amd64 Conflicts git:i386' apt install git-ng -s
 
 
 msgmsg 'Now mix it up by' 'holding both'
diff --git a/vendor/ubuntu/apt.conf-01-vendor-ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
index 64797799a..30d25a717 100644
--- a/vendor/ubuntu/apt.conf-01-vendor-ubuntu
+++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
@@ -1,9 +1,2 @@
 Acquire::Changelogs::AlwaysOnline "true";
 Acquire::http::User-Agent-Non-Interactive "true";
-
-// Enable the new solver by default for our commands
-binary::apt::APT::Solver "3.0";
-binary::apt-get::APT::Solver "3.0";
-// Allow apt-get to remove manually installed packages for the
-// first phase.
-binary::apt-get::APT::Solver::RemoveManual "true";