From 5eab1b07428e4078bd15ca5b69f28f2733850cdd Mon Sep 17 00:00:00 2001 From: Jakub Guzik Date: Tue, 23 Mar 2021 00:13:44 +0100 Subject: Unification of label filter across list/prune endpoints Signed-off-by: Jakub Guzik --- libpod/image/prune.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'libpod/image/prune.go') diff --git a/libpod/image/prune.go b/libpod/image/prune.go index d6ae5feaf..1ab785dd2 100644 --- a/libpod/image/prune.go +++ b/libpod/image/prune.go @@ -8,6 +8,7 @@ import ( "github.com/containers/podman/v3/libpod/events" "github.com/containers/podman/v3/pkg/domain/entities/reports" "github.com/containers/podman/v3/pkg/timetype" + "github.com/containers/podman/v3/pkg/util" "github.com/containers/storage" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -16,24 +17,12 @@ import ( func generatePruneFilterFuncs(filter, filterValue string) (ImageFilter, error) { switch filter { case "label": - var filterArray = strings.SplitN(filterValue, "=", 2) - var filterKey = filterArray[0] - if len(filterArray) > 1 { - filterValue = filterArray[1] - } else { - filterValue = "" - } return func(i *Image) bool { labels, err := i.Labels(context.Background()) if err != nil { return false } - for labelKey, labelValue := range labels { - if labelKey == filterKey && (filterValue == "" || labelValue == filterValue) { - return true - } - } - return false + return util.MatchLabelFilters([]string{filterValue}, labels) }, nil case "until": -- cgit v1.2.3-54-g00ecf