diff options
Diffstat (limited to 'cmd/podman/rmi.go')
| -rw-r--r-- | cmd/podman/rmi.go | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go index 709ed14e0..5b8bf1ea3 100644 --- a/cmd/podman/rmi.go +++ b/cmd/podman/rmi.go @@ -5,8 +5,6 @@ import ( "os" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/cmd/podman/varlink" - "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/adapter" "github.com/containers/storage" "github.com/pkg/errors" @@ -16,8 +14,8 @@ import ( var ( rmiCommand cliconfig.RmiValues rmiDescription = "Removes one or more locally stored images." - _rmiCommand = &cobra.Command{ - Use: "rmi", + _rmiCommand = cobra.Command{ + Use: "rmi [flags] IMAGE [IMAGE...]", Short: "Removes one or more images from local storage", Long: rmiDescription, RunE: func(cmd *cobra.Command, args []string) error { @@ -31,19 +29,8 @@ var ( } ) -func imageNotFound(err error) bool { - if errors.Cause(err) == image.ErrNoSuchImage { - return true - } - switch err.(type) { - case *iopodman.ImageNotFound: - return true - } - return false -} - func init() { - rmiCommand.Command = _rmiCommand + rmiCommand.Command = &_rmiCommand rmiCommand.SetUsageTemplate(UsageTemplate()) flags := rmiCommand.Flags() flags.BoolVarP(&rmiCommand.All, "all", "a", false, "Remove all images") @@ -80,7 +67,7 @@ func rmiCmd(c *cliconfig.RmiValues) error { if errors.Cause(err) == storage.ErrImageUsedByContainer { fmt.Printf("A container associated with containers/storage, i.e. via Buildah, CRI-O, etc., may be associated with this image: %-12.12s\n", img.ID()) } - if !imageNotFound(err) { + if !adapter.IsImageNotFound(err) { failureCnt++ } if lastError != nil { @@ -135,7 +122,7 @@ func rmiCmd(c *cliconfig.RmiValues) error { newImage, err := runtime.NewImageFromLocal(i) if err != nil { if lastError != nil { - if !imageNotFound(lastError) { + if !adapter.IsImageNotFound(lastError) { failureCnt++ } fmt.Fprintln(os.Stderr, lastError) @@ -147,7 +134,7 @@ func rmiCmd(c *cliconfig.RmiValues) error { } } - if imageNotFound(lastError) && failureCnt == 0 { + if adapter.IsImageNotFound(lastError) && failureCnt == 0 { exitCode = 1 } |