summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-08-03 09:02:18 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-08-04 12:50:00 -0400
commit41f94a4dc1a6c426f2d05c440bc36a4e7b425809 (patch)
tree0fefde08a04349dc45336c9a5fcd4d748d23897c /cmd
parent77f8c6549ab1df393f613cc13e93e8dcec859614 (diff)
downloadpodman-41f94a4dc1a6c426f2d05c440bc36a4e7b425809.tar.gz
podman-41f94a4dc1a6c426f2d05c440bc36a4e7b425809.tar.bz2
podman-41f94a4dc1a6c426f2d05c440bc36a4e7b425809.zip
Fix podman unpause,pause,kill --all to work like podman stop --all
Currently if you execute podman unpause --all, podman pause --all Podman shows attempts to unpause containers that are not paused and prints an error. This PR catches this error and only prints errors if a paused container was not able to be unpaused. Currently if you execute podman pause --all or podman kill --all, Podman Podman shows attempts to pause or kill containers that are not running and prints an error. This PR catches this error and only prints errors if a running container was not able to be paused or killed. Also change printing of multiple errors to go to stderr and to prefix "Error: " in front to match the output of the last error. Fixes: https://github.com/containers/podman/issues/11098 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/utils/error.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/podman/utils/error.go b/cmd/podman/utils/error.go
index 3464f0779..2d58bc70d 100644
--- a/cmd/podman/utils/error.go
+++ b/cmd/podman/utils/error.go
@@ -1,6 +1,9 @@
package utils
-import "fmt"
+import (
+ "fmt"
+ "os"
+)
type OutputErrors []error
@@ -10,7 +13,7 @@ func (o OutputErrors) PrintErrors() (lastError error) {
}
lastError = o[len(o)-1]
for e := 0; e < len(o)-1; e++ {
- fmt.Println(o[e])
+ fmt.Fprintf(os.Stderr, "Error: %s\n", o[e])
}
return
}