summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-04 13:22:57 -0800
committerGitHub <noreply@github.com>2020-02-04 13:22:57 -0800
commit348e58b59aadbfd873c6c4cd7d2ed4877f43d054 (patch)
treed3c954d02a4aea05a7a9cd305abaef54273ff287 /cmd/podman
parentfac8318cb001404c13db7063cf17de768cd4ca3e (diff)
parentee5b749e653f4c78298d1e290d5a1ae03edc3c05 (diff)
downloadpodman-348e58b59aadbfd873c6c4cd7d2ed4877f43d054.tar.gz
podman-348e58b59aadbfd873c6c4cd7d2ed4877f43d054.tar.bz2
podman-348e58b59aadbfd873c6c4cd7d2ed4877f43d054.zip
Merge pull request #5075 from mheon/filter_forces_all
Force --all when --filter is passed to podman ps
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/ps.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index d2c5e19e2..d93ccc24c 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -205,6 +205,10 @@ func checkFlagsPassed(c *cliconfig.PsValues) error {
if c.Last >= 0 && c.Latest {
return errors.Errorf("last and latest are mutually exclusive")
}
+ // Filter forces all
+ if len(c.Filter) > 0 {
+ c.All = true
+ }
// Quiet conflicts with size and namespace and is overridden by a Go
// template.
if c.Quiet {