Skip to content
Snippets Groups Projects
Commit 7964078b authored by Jérôme Charaoui's avatar Jérôme Charaoui Committed by Dylan Aïssi
Browse files

Import Debian changes 4.3.1+ds1-8+deb12u1

parent 856aae10
No related branches found
Tags apertis/2024.01+dfsg-1+apertis6
3 merge requests!14Merge changes from apertis/v2024-updates into apertis/v2024,!13Backport v2024 <- v2025dev3: Update from debian/bookworm,!12Update from debian/bookworm for apertis/v2025dev3
Pipeline #731688 passed
---
# https://docs.gitlab.com/ce/ci/yaml/#include
include:
- remote: https://salsa.debian.org/onlyjob/ci/raw/master/onlyjob-ci.yml
## "amd64-unstable" always runs by default followed by lintian.
## Job to check Build-Depends versioning:
amd64-testing_unstable:
extends: .build
variables:
arch: amd64
dist: testing_unstable
i386-unstable:
extends: .build
variables:
arch: i386
dist: unstable
amd64-experimental:
extends: .build
variables:
arch: amd64
dist: experimental
libpod (4.3.1+ds1-8+deb12u1) bookworm; urgency=medium
* Non-maintainer upload.
* d/patches: backport fix for removed container handling (Closes: #1059496)
-- Jérôme Charaoui <jerome@riseup.net> Mon, 26 Feb 2024 09:30:29 -0500
libpod (4.3.1+ds1-8) unstable; urgency=medium
* [upstream] unbreak using docker as client
......
From: Valentin Rothberg <vrothberg@redhat.com>
Date: Mon, 6 Feb 2023 13:52:40 +0100
Subject: [PATCH] network ls: handle removed container
Handle a race condition in the REST API when listing networks.
In between listing all containers and inspecting them, they may have
already been removed, so handle this case gracefully.
[NO NEW TESTS NEEDED] as it's a race condition.
Fixes: #17341
Forwarded: not-needed
Origin: upstream, https://github.com/containers/podman/commit/ced934284058232c1c3d76956786106d64511f89
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index 704af4b0e427..587da14361eb 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -74,6 +74,9 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, network *netty
for _, con := range cons {
data, err := con.Inspect(false)
if err != nil {
+ if errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrRemoved) {
+ continue
+ }
return nil, err
}
if netData, ok := data.NetworkSettings.Networks[network.Name]; ok {
......@@ -3,3 +3,4 @@ system-goimports.patch
CVE-2023-0778.patch
fix-podman-client.patch
show-graphroot-before-removal.patch
fix-removed-container-handling.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment