Merge pull request #5189 from mheon/only_set_all_on_status

Only set --all when a status filter is given to ps

1 files changed, 8 insertions, 2 deletions

diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index d93ccc24c..accd5b51a 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -205,9 +205,15 @@ func checkFlagsPassed(c *cliconfig.PsValues) error {
 	if c.Last >= 0 && c.Latest {
 		return errors.Errorf("last and latest are mutually exclusive")
 	}
-	// Filter forces all
+	// Filter on status forces all
 	if len(c.Filter) > 0 {
-		c.All = true
+		for _, filter := range c.Filter {
+			splitFilter := strings.SplitN(filter, "=", 2)
+			if strings.ToLower(splitFilter[0]) == "status" {
+				c.All = true
+				break
+			}
+		}
 	}
 	// Quiet conflicts with size and namespace and is overridden by a Go
 	// template.