aboutsummaryrefslogtreecommitdiff
path: root/pkg/ps
diff options
context:
space:
mode:
authorBaron Lenardson <lenardson.baron@gmail.com>2020-12-22 20:29:31 -0600
committerBaron Lenardson <baron.lenardson@target.com>2020-12-24 20:27:41 +0000
commit76afb50f3ae41a3cc43fca8cc41a2d2f1f1b6dcc (patch)
tree0adcdac5dc8a124db32a90a386d708fc01922bf7 /pkg/ps
parent8f75ed958562f4deb47799259e22d4f195e0d426 (diff)
downloadpodman-76afb50f3ae41a3cc43fca8cc41a2d2f1f1b6dcc.tar.gz
podman-76afb50f3ae41a3cc43fca8cc41a2d2f1f1b6dcc.tar.bz2
podman-76afb50f3ae41a3cc43fca8cc41a2d2f1f1b6dcc.zip
Consolidate filter logic to pkg subdirectory
Per the conversation on pull/8724 I am consolidating filter logic and helper functions under the pkg/domain/filters dir. Signed-off-by: Baron Lenardson <lenardson.baron@gmail.com>
Diffstat (limited to 'pkg/ps')
-rw-r--r--pkg/ps/ps.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go
index 6c26e8708..9e0dcb728 100644
--- a/pkg/ps/ps.go
+++ b/pkg/ps/ps.go
@@ -11,8 +11,8 @@ import (
"github.com/containers/podman/v2/libpod"
"github.com/containers/podman/v2/libpod/define"
- lpfilters "github.com/containers/podman/v2/libpod/filters"
"github.com/containers/podman/v2/pkg/domain/entities"
+ "github.com/containers/podman/v2/pkg/domain/filters"
psdefine "github.com/containers/podman/v2/pkg/ps/define"
"github.com/containers/storage"
"github.com/pkg/errors"
@@ -27,7 +27,7 @@ func GetContainerLists(runtime *libpod.Runtime, options entities.ContainerListOp
all := options.All || options.Last > 0
if len(options.Filters) > 0 {
for k, v := range options.Filters {
- generatedFunc, err := lpfilters.GenerateContainerFilterFuncs(k, v, runtime)
+ generatedFunc, err := filters.GenerateContainerFilterFuncs(k, v, runtime)
if err != nil {
return nil, err
}
@@ -41,7 +41,7 @@ func GetContainerLists(runtime *libpod.Runtime, options entities.ContainerListOp
all = true
}
if !all {
- runningOnly, err := lpfilters.GenerateContainerFilterFuncs("status", []string{define.ContainerStateRunning.String()}, runtime)
+ runningOnly, err := filters.GenerateContainerFilterFuncs("status", []string{define.ContainerStateRunning.String()}, runtime)
if err != nil {
return nil, err
}