diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-22 22:10:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 22:10:07 +0100 |
| commit | 84b3f2a7f622636e622416403d1f2642edbbd117 (patch) | |
| tree | 56abfe745ffb65c6fbb75824807345c217d684f8 /cmd/podman/rm.go | |
| parent | c757cb23ca15634077a8b9fa33aba7abd1c8249b (diff) | |
| parent | 6ab6e2c3073d47755d441ee8c1bce90e34082e99 (diff) | |
| download | podman-84b3f2a7f622636e622416403d1f2642edbbd117.tar.gz podman-84b3f2a7f622636e622416403d1f2642edbbd117.tar.bz2 podman-84b3f2a7f622636e622416403d1f2642edbbd117.zip | |
Merge pull request #2386 from baude/cobravalidation
Improve command line validation
Diffstat (limited to 'cmd/podman/rm.go')
| -rw-r--r-- | cmd/podman/rm.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index 2e5fe1dc0..01ed70f52 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -28,6 +28,9 @@ Running containers will not be removed without the -f option. rmCommand.GlobalFlags = MainGlobalOpts return rmCmd(&rmCommand) }, + Args: func(cmd *cobra.Command, args []string) error { + return checkAllAndLatest(cmd, args, false) + }, Example: `podman rm imageID podman rm mywebserver myflaskserver 860a4b23 podman rm --force --all`, @@ -42,6 +45,7 @@ func init() { flags.BoolVarP(&rmCommand.Force, "force", "f", false, "Force removal of a running container. The default is false") flags.BoolVarP(&rmCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of") flags.BoolVarP(&rmCommand.Volumes, "volumes", "v", false, "Remove the volumes associated with the container") + markFlagHiddenForRemoteClient("latest", flags) } // saveCmd saves the image to either docker-archive or oci @@ -57,10 +61,6 @@ func rmCmd(c *cliconfig.RmValues) error { } defer runtime.Shutdown(false) - if err := checkAllAndLatest(&c.PodmanCommand); err != nil { - return err - } - delContainers, err := getAllOrLatestContainers(&c.PodmanCommand, runtime, -1, "all") if err != nil { if c.Force && len(c.InputArgs) > 0 { |