Merge pull request containers#8264 from joelsmith/master

Show error on bad name filter in podman ps
rhatdan · Nov 6, 2020 · e2b82e6 · e2b82e6
2 parents dc58d4e + 708d620
commit e2b82e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/libpod/filters/containers.go b/libpod/filters/containers.go
@@ -11,6 +11,7 @@ import (
 	"github.com/containers/podman/v2/pkg/timetype"
 	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 // GenerateContainerFilterFuncs return ContainerFilter functions based of filter.
@@ -40,6 +41,7 @@ func GenerateContainerFilterFuncs(filter, filterValue string, r *libpod.Runtime)
 		return func(c *libpod.Container) bool {
 			match, err := regexp.MatchString(filterValue, c.Name())
 			if err != nil {
+				logrus.Errorf("Failed to compile regex for 'name' filter: %v", err)
 				return false
 			}
 			return match

diff --git a/libpod/filters/pods.go b/libpod/filters/pods.go
@@ -9,6 +9,7 @@ import (
 	"github.com/containers/podman/v2/libpod/define"
 	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 // GeneratePodFilterFunc takes a filter and filtervalue (key, value)
@@ -81,6 +82,7 @@ func GeneratePodFilterFunc(filter, filterValue string) (
 		return func(p *libpod.Pod) bool {
 			match, err := regexp.MatchString(filterValue, p.Name())
 			if err != nil {
+				logrus.Errorf("Failed to compile regex for 'name' filter: %v", err)
 				return false
 			}
 			return match