diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-30 05:13:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 05:13:49 +0100 |
| commit | 7f0771fa9401c26e942c67788bebc0041dfa3311 (patch) | |
| tree | dc5d925da58c4658b26ba850ead3b09d67226e10 /pkg/ps | |
| parent | 9c9f02aad773051fa742a874844f08f2fb567d3b (diff) | |
| parent | 76afb50f3ae41a3cc43fca8cc41a2d2f1f1b6dcc (diff) | |
| download | podman-7f0771fa9401c26e942c67788bebc0041dfa3311.tar.gz podman-7f0771fa9401c26e942c67788bebc0041dfa3311.tar.bz2 podman-7f0771fa9401c26e942c67788bebc0041dfa3311.zip | |
Merge pull request #8809 from bblenard/bblenard-dev
Consolidate filter logic to pkg subdirectory
Diffstat (limited to 'pkg/ps')
| -rw-r--r-- | pkg/ps/ps.go | 6 |
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 } |