From 328250e7bef56b0b69dbea124c1170abd289900f Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 20 Feb 2019 13:46:41 -0600 Subject: Improve command line validation Use the checkallandlatest function to validate flag usage as part of the cobra command args validation. Signed-off-by: baude --- cmd/podman/cleanup.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'cmd/podman/cleanup.go') diff --git a/cmd/podman/cleanup.go b/cmd/podman/cleanup.go index 89a4ba050..58ac80624 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`, @@ -49,10 +52,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() -- cgit v1.2.3-54-g00ecf