From 30bb8931930d157718ffe6ce564a40084293e076 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 3 Aug 2022 14:01:11 -0700 Subject: [PATCH] utils/RunUnderSystemdScope: fix A slightly incorrect porting of [1] to main branch resulted in duplicated case statement in a switch. Remove it. Fixes: 1e277b8364eb8e [1] https://github.com/cri-o/cri-o/pull/5914/commits/343bcdd8f793af Signed-off-by: Kir Kolyshkin --- utils/utils.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/utils.go b/utils/utils.go index c6de0e53b1a..512722dc367 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -87,8 +87,6 @@ func RunUnderSystemdScope(mgr *dbusmgr.DbusConnManager, pid int, slice, unitName if s != "done" { return fmt.Errorf("error moving conmon with pid %d to systemd unit %s: got %s", pid, unitName, s) } - case <-ch: - close(ch) case <-time.After(time.Minute * 6): // This case is a work around to catch situations where the dbus library sends the // request but it unexpectedly disappears. We set the timeout very high to make sure