1 files changed, 20 insertions, 26 deletions

diff --git a/cmd/podman/pod_rm.go b/cmd/podman/pod_rm.go
index 54cee2a50..ba16d03c7 100644
--- a/cmd/podman/pod_rm.go
+++ b/cmd/podman/pod_rm.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -26,6 +26,9 @@ If --force is specified, all containers will be stopped, then removed.
 			podRmCommand.GlobalFlags = MainGlobalOpts
 			return podRmCmd(&podRmCommand)
 		},
+		Args: func(cmd *cobra.Command, args []string) error {
+			return checkAllAndLatest(cmd, args, false)
+		},
 		Example: `podman pod rm mywebserverpod
   podman pod rm -f 860a4b23
   podman pod rm -f -a`,
@@ -39,39 +42,30 @@ func init() {
 	flags.BoolVarP(&podRmCommand.All, "all", "a", false, "Remove all running pods")
 	flags.BoolVarP(&podRmCommand.Force, "force", "f", false, "Force removal of a running pod by first stopping all containers, then removing all containers in the pod.  The default is false")
 	flags.BoolVarP(&podRmCommand.Latest, "latest", "l", false, "Remove the latest pod podman is aware of")
-
+	markFlagHiddenForRemoteClient("latest", flags)
 }
 
-// saveCmd saves the image to either docker-archive or oci
+// podRmCmd deletes pods
 func podRmCmd(c *cliconfig.PodRmValues) error {
-	if err := checkMutuallyExclusiveFlags(&c.PodmanCommand); err != nil {
-		return err
-	}
-
-	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
+	podRmIds, podRmErrors := runtime.RemovePods(getContext(), c)
+	for _, p := range podRmIds {
+		fmt.Println(p)
+	}
+	if len(podRmErrors) == 0 {
+		return nil
+	}
+	// Grab the last error
+	lastError := podRmErrors[len(podRmErrors)-1]
+	// Remove the last error from the error slice
+	podRmErrors = podRmErrors[:len(podRmErrors)-1]
 
-	ctx := getContext()
-	force := c.Force
-
-	// getPodsFromContext returns an error when a requested pod
-	// isn't found. The only fatal error scenerio is when there are no pods
-	// in which case the following loop will be skipped.
-	pods, lastError := getPodsFromContext(&c.PodmanCommand, runtime)
-
-	for _, pod := range pods {
-		err = runtime.RemovePod(ctx, pod, force, force)
-		if err != nil {
-			if lastError != nil {
-				logrus.Errorf("%q", lastError)
-			}
-			lastError = errors.Wrapf(err, "failed to delete pod %v", pod.ID())
-		} else {
-			fmt.Println(pod.ID())
-		}
+	for _, err := range podRmErrors {
+		logrus.Errorf("%q", err)
 	}
 	return lastError
 }