1 files changed, 25 insertions, 27 deletions

diff --git a/cmd/podman/pod_unpause.go b/cmd/podman/pod_unpause.go
index a917919c3..16481d0e2 100644
--- a/cmd/podman/pod_unpause.go
+++ b/cmd/podman/pod_unpause.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"
@@ -22,7 +22,12 @@ var (
 			podUnpauseCommand.GlobalFlags = MainGlobalOpts
 			return podUnpauseCmd(&podUnpauseCommand)
 		},
-		Example: "POD-NAME|POD-ID [POD-NAME|POD-ID ...]",
+		Args: func(cmd *cobra.Command, args []string) error {
+			return checkAllAndLatest(cmd, args, false)
+		},
+		Example: `podman pod unpause podID1 podID2
+  podman pod unpause --all
+  podman pod unpause --latest`,
 	}
 )
 
@@ -32,44 +37,37 @@ func init() {
 	flags := podUnpauseCommand.Flags()
 	flags.BoolVarP(&podUnpauseCommand.All, "all", "a", false, "Unpause all running pods")
 	flags.BoolVarP(&podUnpauseCommand.Latest, "latest", "l", false, "Unpause the latest pod podman is aware of")
+	markFlagHiddenForRemoteClient("latest", flags)
 }
 
 func podUnpauseCmd(c *cliconfig.PodUnpauseValues) error {
-	if err := checkMutuallyExclusiveFlags(&c.PodmanCommand); err != nil {
-		return err
-	}
-
-	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
+	var lastError error
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "error creating libpod runtime")
 	}
 	defer runtime.Shutdown(false)
 
-	// 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)
+	unpauseIDs, conErrors, unpauseErrors := runtime.UnpausePods(c)
 
-	for _, pod := range pods {
-		ctr_errs, err := pod.Unpause()
-		if ctr_errs != nil {
-			for ctr, err := range ctr_errs {
-				if lastError != nil {
-					logrus.Errorf("%q", lastError)
-				}
-				lastError = errors.Wrapf(err, "unable to unpause container %q on pod %q", ctr, pod.ID())
-			}
-			continue
-		}
-		if err != nil {
+	for _, p := range unpauseIDs {
+		fmt.Println(p)
+	}
+	if conErrors != nil && len(conErrors) > 0 {
+		for ctr, err := range conErrors {
 			if lastError != nil {
 				logrus.Errorf("%q", lastError)
 			}
-			lastError = errors.Wrapf(err, "unable to unpause pod %q", pod.ID())
-			continue
+			lastError = errors.Wrapf(err, "unable to unpause container %s", ctr)
 		}
-		fmt.Println(pod.ID())
 	}
-
+	if len(unpauseErrors) > 0 {
+		lastError = unpauseErrors[len(unpauseErrors)-1]
+		// Remove the last error from the error slice
+		unpauseErrors = unpauseErrors[:len(unpauseErrors)-1]
+	}
+	for _, err := range unpauseErrors {
+		logrus.Errorf("%q", err)
+	}
 	return lastError
 }