apt/test/integration, branch 3.1.12Debians commandline package managerhttps://git.kalnischkies.de/apt/atom?h=3.1.122025-11-10T10:01:02ZCorrectly copy provided version in m-a lazy-init2025-11-10T10:01:02ZJulian Andres Klodejak@debian.org2025-11-10T09:41:20Zurn:sha1:2f4299bf39c85b694876cb8030fae0887e8b5edc
When a provides was copied, we inadvertently copied the package
version instead of the provided version. Copy the provided version
instead.
Closes: #1120463
Revert "depcache: Allow changing multi-arch versions for removed siblings"2025-10-26T08:31:20ZJulian Andres Klodejak@debian.org2025-10-26T08:14:20Zurn:sha1:22786e32b613518ae3a5cd07e9e2f1419b2c6552
This reverts commit 74636b64a7ee56637a3ce4ddc1d060ca9f8b77e1.
Adjust the test case accordingly, as it is no longer possible to
install libgcc-s1:s390x. We need to sort this out in the ToDepCache
translation layer at a later time.
Sadly the depcache rejects valid solutions like this; solving this
isn't trivial. Technically we need to split up the FromUser and
auto-bit handling to solve this, but even then, MarkDelete() with
FromUser=0 moves the auto-bit on metapackages; this doesn't happen
when doing FromUser=1, so we can't always do FromUser=1.
Fixes: a3fca052ca21ad222ac7f2fdd7f3fe84b44beb60
test: Correctly skip tests when not using -j2025-10-26T07:28:35ZJulian Andres Klodejak@debian.org2025-10-26T06:59:52Zurn:sha1:487ce0983c2008991566b4cfb269fd7d29a08e98
We never implemented comment support in the skip test file for
-j as we only run with -j, but the debian/tests/run-tests runs
without parallelism.
tests: Do not skip tests for --solver internal2025-10-26T07:28:35ZJulian Andres Klodejak@debian.org2025-10-26T06:58:43Zurn:sha1:78da58ec0c1cdbda6cdd22c63f85ddac703bb0d6
Remove the exports for the default as we don't want those
inherited, they can just be reset. Set the skip file to
/dev/null when a solver is selected, to make sure that
tests don't fall back to the default skip file.
Adjust test cases to treat 3.0 as default APT_SOLVER if not set2025-10-26T07:28:08ZJulian Andres Klodejak@debian.org2025-10-26T07:24:39Zurn:sha1:5e8e69cdd6b512480f3208298725e1e44c80f06e
Not needed so far because we export a default 3.0 APT_SOLVER, but
quite useful if we stop doing so (next commit).
solver3: Allow removing manually installed packages2025-10-25T20:16:54ZJulian Andres Klodejak@debian.org2025-10-25T19:31:34Zurn:sha1:a3fca052ca21ad222ac7f2fdd7f3fe84b44beb60Enable the new solver by default in 0.31, 1.21, 2.11, 3.12025-10-25T20:16:54ZJulian Andres Klodejak@debian.org2025-10-25T15:42:11Zurn:sha1:c5c5d10d1b2ac0a589102315840c4f2a075b18c1
Enable the new solver by default and remove the vendor-specific
configuration change in Ubuntu's drop-in.
Implement architecture variants2025-10-25T18:42:14ZJulian Andres Klodejulian.klode@canonical.com2025-01-07T16:39:32Zurn:sha1:9d62eef571ffd1fd2df8b97884d3689fced27fb1
Architecture variants are children of an architecture that share
the same ABI but are optimized for different ISA levels. They
are available in Ubuntu 25.10 and newer, and not supported in
Debian or other distributions.
A deb built for a variant contains the Architecture-Variant field,
and the Architecture field points to the baseline, for example:
Architecture: amd64
Architecture-Variant: amd64v3
However, the apt-get indextargets command reports the variant in the
Architecture: field, and most of the code in APT presents the variant
as the architecture.
There are two types of variants:
1. Standalone variants are recorded in the Architectures field of the
Release file as if they were a real architecture:
Architectures: amd64 amd64v3
Standalone architecture variants only fetch the standalone
architecture variant's Packages file. To do this, this patch
changes the code such that the variants indextargets "supplant"
the base targets.
This may have complicated outcomes on the apt-get indextargets
command.
2. Other variants can only be identified by their files being recorded
with hashes in the Release file.
APT fetches both the base architecture's as well as the variant's
Packages file.
Variants are configured in the
APT::Architecture-Variants
list.
Image builders may want to build specific variant images using
APT::Architecture-Variants { "amd64v3"; }
But this commit also implements an automatic discovery mechanism
using the varianttable and /proc/cpuinfo.
APT::Architecture-Variants "auto";
ExecFork: Simplify closing and make it safe2025-10-20T18:06:50ZJulian Andres Klodejak@debian.org2025-10-20T18:02:17Zurn:sha1:3dea3434bf2003b757d7ecdb5a8194c8a0c7023f
Implement a wrapper around FD_CLOEXEC and use it in place of
the raw fcntl(). This wrapper _Exit()s the child if the operation
failed.
Restructure the close_range() handling to simply mark all fds for
closing first and then "reopen" the ones we should keep.
Add some comments and tests around Keep-Fd ordering2025-10-20T17:42:57ZJulian Andres Klodejak@debian.org2025-10-20T17:41:57Zurn:sha1:cb8df17ff8e59192ae2ab864006eea120d408a7a