diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-09 10:28:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-09 10:28:14 -0800 |
| commit | 78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b (patch) | |
| tree | 4adf8d4048a6b2c4c89ade6bb9375716d8fe8bd3 /cmd/podman/unpause.go | |
| parent | 7813f90ce623c8882e53171c8ffe7fb46664ead7 (diff) | |
| parent | 2dd9cae37cb076418393ba61c0fb7b8cf97148f3 (diff) | |
| download | podman-78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b.tar.gz podman-78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b.tar.bz2 podman-78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b.zip | |
Merge pull request #1772 from baude/rmdelpaused
rm -f now removes a paused container
Diffstat (limited to 'cmd/podman/unpause.go')
| -rw-r--r-- | cmd/podman/unpause.go | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/cmd/podman/unpause.go b/cmd/podman/unpause.go index 648fc9d3d..d77e056f8 100644 --- a/cmd/podman/unpause.go +++ b/cmd/podman/unpause.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "os" "github.com/containers/libpod/cmd/podman/libpodruntime" @@ -37,7 +36,6 @@ var ( func unpauseCmd(c *cli.Context) error { var ( - lastError error unpauseContainers []*libpod.Container unpauseFuncs []shared.ParallelWorkerInput ) @@ -90,18 +88,6 @@ func unpauseCmd(c *cli.Context) error { } logrus.Debugf("Setting maximum workers to %d", maxWorkers) - unpauseErrors := shared.ParallelExecuteWorkerPool(maxWorkers, unpauseFuncs) - - for cid, result := range unpauseErrors { - if result != nil && result != libpod.ErrCtrStopped { - if len(unpauseErrors) > 1 { - fmt.Println(result.Error()) - } - lastError = result - continue - } - fmt.Println(cid) - } - - return lastError + unpauseErrors, errCount := shared.ParallelExecuteWorkerPool(maxWorkers, unpauseFuncs) + return printParallelOutput(unpauseErrors, errCount) } |