fix: prevent deadlock when linux32 fails - #2880
Merged
Merged
Conversation
henryiii
approved these changes
May 31, 2026
This was the case when running `nox -s tests -- --run-podman -v -s 'unit_test/oci_container_test.py::test_multiarch_image[podman-OCIPlatform.i386]'` on macOS arm64.
henryiii
force-pushed
the
fix-linux32-deadlock
branch
from
May 31, 2026 22:27
0d0b071 to
5f3746b
Compare
This was referenced Jun 2, 2026
mayeut
pushed a commit
that referenced
this pull request
Jun 2, 2026
The linux32 sanity check added in #2880 omitted `*platform_args`, unlike the surrounding `uname -m` probes and the `create` command. On the i386 fallback path `platform_args` is reassigned to AMD64, so without forwarding it the check could run against a different image variant than the one actually built (e.g. on a multi-platform/containerd backend), making the check meaningless or pulling the wrong variant. Assisted-by: ClaudeCode:claude-opus-4.8
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Found while crafting #2879
This was the case when running
nox -s tests -- --run-podman -v -s 'unit_test/oci_container_test.py::test_multiarch_image[podman-OCIPlatform.i386]'on macOS arm64.