opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 03:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ps filter with key=value labels

Browse Source 
Closes: #1101
Approved by: rhatdan
This commit is contained in:
Joshua Roys
2018-07-16 10:36:57 -04:00
committed by Atomic Bot
parent 6372c977ea
commit ea5fad6c8b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/podman/ps.go
View File

@ -235,7 +235,7 @@ func psCmd(c *cli.Context) error {
if opts.Filter != "" { if opts.Filter != "" {
filters := strings.Split(opts.Filter, ",") filters := strings.Split(opts.Filter, ",")
for _, f := range filters { for _, f := range filters {
filterSplit := strings.Split(f, "=") filterSplit := strings.SplitN(f, "=", 2)
if len(filterSplit) < 2 { if len(filterSplit) < 2 {
return errors.Errorf("filter input must be in the form of filter=value: %s is invalid", f) return errors.Errorf("filter input must be in the form of filter=value: %s is invalid", f)
} }
@ -303,9 +303,16 @@ func generateContainerFilterFuncs(filter, filterValue string, runtime *libpod.Ru
return strings.Contains(c.ID(), filterValue) return strings.Contains(c.ID(), filterValue)
}, nil }, nil
case "label": case "label":
var filterArray []string = strings.Split(filterValue, "=")
var filterKey string = filterArray[0]
if len(filterArray) > 1 {
filterValue = filterArray[1]
} else {
filterValue = ""
}
return func(c *libpod.Container) bool { return func(c *libpod.Container) bool {
for _, label := range c.Labels() { for labelKey, labelValue := range c.Labels() {
if label == filterValue { if labelKey == filterKey && ("" == filterValue || labelValue == filterValue) {
return true return true
} }
} }