1 files changed, 30 insertions, 5 deletions
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index 201249fc3..63b0f9d2f 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -234,15 +234,25 @@ func (r *LocalRuntime) StopContainers(ctx context.Context, cli *cliconfig.StopVa
 
 	ids, err := iopodman.GetContainersByContext().Call(r.Conn, cli.All, cli.Latest, cli.InputArgs)
 	if err != nil {
-		return ok, failures, err
+		return ok, failures, TranslateError(err)
 	}
 
 	for _, id := range ids {
-		stopped, err := iopodman.StopContainer().Call(r.Conn, id, int64(cli.Timeout))
-		if err != nil {
+		if _, err := iopodman.StopContainer().Call(r.Conn, id, int64(cli.Timeout)); err != nil {
+			transError := TranslateError(err)
+			if errors.Cause(transError) == libpod.ErrCtrStopped {
+				ok = append(ok, id)
+				continue
+			}
+			if errors.Cause(transError) == libpod.ErrCtrStateInvalid && cli.All {
+				ok = append(ok, id)
+				continue
+			}
 			failures[id] = err
 		} else {
-			ok = append(ok, stopped)
+			// We should be using ID here because in varlink, only successful returns
+			// include the string id
+			ok = append(ok, id)
 		}
 	}
 	return ok, failures, nil
@@ -310,7 +320,7 @@ func (r *LocalRuntime) KillContainers(ctx context.Context, cli *cliconfig.KillVa
 func (r *LocalRuntime) RemoveContainers(ctx context.Context, cli *cliconfig.RmValues) ([]string, map[string]error, error) {
 	ids, err := iopodman.GetContainersByContext().Call(r.Conn, cli.All, cli.Latest, cli.InputArgs)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, TranslateError(err)
 	}
 
 	var (
@@ -961,3 +971,18 @@ func (r *LocalRuntime) Port(c *cliconfig.PortValues) ([]*Container, error) {
 func (r *LocalRuntime) GenerateSystemd(c *cliconfig.GenerateSystemdValues) (string, error) {
 	return iopodman.GenerateSystemd().Call(r.Conn, c.InputArgs[0], c.RestartPolicy, int64(c.StopTimeout), c.Name)
 }
+
+// GetNamespaces returns namespace information about a container for PS
+func (r *LocalRuntime) GetNamespaces(container shared.PsContainerOutput) *shared.Namespace {
+	ns := shared.Namespace{
+		PID:    container.PID,
+		Cgroup: container.Cgroup,
+		IPC:    container.IPC,
+		MNT:    container.MNT,
+		NET:    container.NET,
+		PIDNS:  container.PIDNS,
+		User:   container.User,
+		UTS:    container.UTS,
+	}
+	return &ns
+}