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/cleanup.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/cleanup.go')
| -rw-r--r-- | cmd/podman/cleanup.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/cleanup.go b/cmd/podman/cleanup.go index 89a4ba050..d68255aa2 100644 --- a/cmd/podman/cleanup.go +++ b/cmd/podman/cleanup.go @@ -26,6 +26,9 @@ var ( cleanupCommand.GlobalFlags = MainGlobalOpts return cleanupCmd(&cleanupCommand) }, + Args: func(cmd *cobra.Command, args []string) error { + return checkAllAndLatest(cmd, args, false) + }, Example: `podman container cleanup --latest podman container cleanup ctrID1 ctrID2 ctrID3 podman container cleanup --all`, @@ -40,6 +43,7 @@ func init() { flags.BoolVarP(&cleanupCommand.All, "all", "a", false, "Cleans up all containers") flags.BoolVarP(&cleanupCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of") flags.BoolVar(&cleanupCommand.Remove, "rm", false, "After cleanup, remove the container entirely") + markFlagHiddenForRemoteClient("latest", flags) } func cleanupCmd(c *cliconfig.CleanupValues) error { @@ -49,10 +53,6 @@ func cleanupCmd(c *cliconfig.CleanupValues) error { } defer runtime.Shutdown(false) - if err := checkAllAndLatest(&c.PodmanCommand); err != nil { - return err - } - cleanupContainers, lastError := getAllOrLatestContainers(&c.PodmanCommand, runtime, -1, "all") ctx := getContext() |