Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package podman for openSUSE:Factory checked in at 2022-05-26 18:43:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/podman (Old) and /work/SRC/openSUSE:Factory/.podman.new.2254 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "podman" Thu May 26 18:43:53 2022 rev:94 rq:979149 version:4.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/podman/podman.changes 2022-04-22 21:53:01.570722034 +0200 +++ /work/SRC/openSUSE:Factory/.podman.new.2254/podman.changes 2022-05-26 18:43:56.713169927 +0200 @@ -1,0 +2,9 @@ +Mon May 23 11:48:34 UTC 2022 - Dario Faggioli <[email protected]> + +- Backport upstream commit be5abf03ababc ("fix: Container.cGroupPath() + skip empty line to avoid false error logging") for fixing "Error parsing + cgroup: expected 3 fields but got 1" (see bsc#1199790, as it applies + to Factory/Tumbleweed too) + * 0004-fix-Container.cGroupPath-skip-empty-line-to-avoid-fa.patch + +------------------------------------------------------------------- New: ---- 0004-fix-Container.cGroupPath-skip-empty-line-to-avoid-fa.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ podman.spec ++++++ --- /var/tmp/diff_new_pack.YzMeer/_old 2022-05-26 18:43:57.457170795 +0200 +++ /var/tmp/diff_new_pack.YzMeer/_new 2022-05-26 18:43:57.457170795 +0200 @@ -36,6 +36,7 @@ Patch1: 0001-Relabel-relabel-links-instead-of-their-targets.patch Patch2: 0002-specgen-do-not-set-OOMScoreAdj-by-default.patch Patch3: 0001-Adjust-buildah-to-opencontainers-selinux-v1.10.1.patch +Patch4: 0004-fix-Container.cGroupPath-skip-empty-line-to-avoid-fa.patch BuildRequires: bash-completion BuildRequires: cni BuildRequires: device-mapper-devel ++++++ 0004-fix-Container.cGroupPath-skip-empty-line-to-avoid-fa.patch ++++++ >From a079b84539fc6120c12ee656f0224303845b3206 Mon Sep 17 00:00:00 2001 From: ttyS3 <[email protected]> Date: Sun, 8 May 2022 01:25:48 +0800 Subject: [PATCH] fix: Container.cGroupPath() skip empty line to avoid false error logging Signed-off-by: ttyS3 <[email protected]> [NO NEW TESTS NEEDED] --- libpod/container.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libpod/container.go b/libpod/container.go index e280b87a8..a953f1da9 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -958,6 +958,10 @@ func (c *Container) cGroupPath() (string, error) { var cgroupPath string for _, line := range bytes.Split(lines, []byte("\n")) { + // skip last empty line + if len(line) == 0 { + continue + } // cgroups(7) nails it down to three fields with the 3rd // pointing to the cgroup's path which works both on v1 and v2. fields := bytes.Split(line, []byte(":")) -- 2.36.1
