From 517bc28360ba6417d5333720f03f010514862ec3 Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude@redhat.com>
Date: Tue, 28 Apr 2020 14:26:43 -0500
Subject: system tests must pass

Signed-off-by: Brent Baude <bbaude@redhat.com>
---
 cmd/podman/images/exists.go |  1 +
 cmd/podman/images/images.go | 13 +++++++------
 cmd/podman/images/list.go   |  3 ++-
 cmd/podman/images/prune.go  |  3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'cmd/podman/images')

diff --git a/cmd/podman/images/exists.go b/cmd/podman/images/exists.go
index 6464e6cd8..13191113f 100644
--- a/cmd/podman/images/exists.go
+++ b/cmd/podman/images/exists.go
@@ -15,6 +15,7 @@ var (
 		RunE:  exists,
 		Example: `podman image exists ID
   podman image exists IMAGE && podman pull IMAGE`,
+		DisableFlagsInUseLine: true,
 	}
 )
 
diff --git a/cmd/podman/images/images.go b/cmd/podman/images/images.go
index fd3ede26a..96ef344bf 100644
--- a/cmd/podman/images/images.go
+++ b/cmd/podman/images/images.go
@@ -11,12 +11,13 @@ import (
 var (
 	// podman _images_  Alias for podman image _list_
 	imagesCmd = &cobra.Command{
-		Use:     strings.Replace(listCmd.Use, "list", "images", 1),
-		Args:    listCmd.Args,
-		Short:   listCmd.Short,
-		Long:    listCmd.Long,
-		RunE:    listCmd.RunE,
-		Example: strings.Replace(listCmd.Example, "podman image list", "podman images", -1),
+		Use:                   strings.Replace(listCmd.Use, "list", "images", 1),
+		Args:                  listCmd.Args,
+		Short:                 listCmd.Short,
+		Long:                  listCmd.Long,
+		RunE:                  listCmd.RunE,
+		Example:               strings.Replace(listCmd.Example, "podman image list", "podman images", -1),
+		DisableFlagsInUseLine: true,
 	}
 )
 
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index b979cb6af..552fed804 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -32,7 +32,7 @@ type listFlagType struct {
 var (
 	// Command: podman image _list_
 	listCmd = &cobra.Command{
-		Use:     "list [flag] [IMAGE]",
+		Use:     "list [FLAGS] [IMAGE]",
 		Aliases: []string{"ls"},
 		Args:    cobra.MaximumNArgs(1),
 		Short:   "List images in local storage",
@@ -41,6 +41,7 @@ var (
 		Example: `podman image list --format json
   podman image list --sort repository --format "table {{.ID}} {{.Repository}} {{.Tag}}"
   podman image list --filter dangling=true`,
+		DisableFlagsInUseLine: true,
 	}
 
 	// Options to pull data
diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go
index b90d889be..eb9e4a7e4 100644
--- a/cmd/podman/images/prune.go
+++ b/cmd/podman/images/prune.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/common"
 	"github.com/containers/libpod/cmd/podman/registry"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/pkg/errors"
@@ -18,7 +19,7 @@ var (
   If an image is not being used by a container, it will be removed from the system.`
 	pruneCmd = &cobra.Command{
 		Use:     "prune",
-		Args:    cobra.NoArgs,
+		Args:    common.NoArgs,
 		Short:   "Remove unused images",
 		Long:    pruneDescription,
 		RunE:    prune,
-- 
cgit v1.2.3-54-g00ecf