diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-28 22:40:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 22:40:09 +0200 |
| commit | 30b27819d0fc2e4e61df155758179a387bc9506d (patch) | |
| tree | 986c698b7acaaa9fdf86439f6c41509bd61253e4 | |
| parent | 23be7b50490ac01c31af3266490276dd46ec23c3 (diff) | |
| parent | b3cfb20aa20ada5c00f3c8d06e50ebb5029cf2e9 (diff) | |
| download | podman-30b27819d0fc2e4e61df155758179a387bc9506d.tar.gz podman-30b27819d0fc2e4e61df155758179a387bc9506d.tar.bz2 podman-30b27819d0fc2e4e61df155758179a387bc9506d.zip | |
Merge pull request #5991 from sujil02/pod-rm-test
Fix typos in messages pod rm
| -rw-r--r-- | cmd/podman/pods/rm.go | 4 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/pods.go | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index ea3a6476a..4b9882f8a 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -41,10 +41,10 @@ func init() { }) flags := rmCommand.Flags() - flags.BoolVarP(&rmOptions.All, "all", "a", false, "Restart all running pods") + flags.BoolVarP(&rmOptions.All, "all", "a", false, "Remove all running pods") flags.BoolVarP(&rmOptions.Force, "force", "f", false, "Force removal of a running pod by first stopping all containers, then removing all containers in the pod. The default is false") flags.BoolVarP(&rmOptions.Ignore, "ignore", "i", false, "Ignore errors when a specified pod is missing") - flags.BoolVarP(&rmOptions.Latest, "latest", "l", false, "Restart the latest pod podman is aware of") + flags.BoolVarP(&rmOptions.Latest, "latest", "l", false, "Remove the latest pod podman is aware of") if registry.IsRemote() { _ = flags.MarkHidden("latest") _ = flags.MarkHidden("ignore") diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index 7c06f9a4e..b286bcf0d 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -236,8 +236,6 @@ func (ic *ContainerEngine) PodRm(ctx context.Context, namesOrIds []string, optio err := ic.Libpod.RemovePod(ctx, p, true, options.Force) if err != nil { report.Err = err - reports = append(reports, &report) - continue } reports = append(reports, &report) } |