From 8a77935cd4048a4ce33a502ef5c3e3b193d64fc6 Mon Sep 17 00:00:00 2001 From: Eric Sage Date: Sat, 11 Jul 2015 00:49:59 -0400 Subject: [PATCH 1/3] Return better error for issue #1502. Signed-off-by: Eric Sage --- commands/ls.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/commands/ls.go b/commands/ls.go index 8dec449ab5..11f514a010 100644 --- a/commands/ls.go +++ b/commands/ls.go @@ -87,6 +87,9 @@ func parseFilters(filters []string) (FilterOptions, error) { options := FilterOptions{} for _, f := range filters { kv := strings.SplitN(f, "=", 2) + if len(kv) != 2 { + return options, fmt.Errorf("Unupported filter syntax, please use help ls for details on correct usage.") + } key, value := kv[0], kv[1] switch key { From b75b5d618c14b58452374f7f3ffae0264482953c Mon Sep 17 00:00:00 2001 From: Eric Sage Date: Mon, 13 Jul 2015 17:45:46 -0400 Subject: [PATCH 2/3] Change error message Signed-off-by: Eric Sage --- commands/ls.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/ls.go b/commands/ls.go index 11f514a010..1d3fb0bee8 100644 --- a/commands/ls.go +++ b/commands/ls.go @@ -88,7 +88,7 @@ func parseFilters(filters []string) (FilterOptions, error) { for _, f := range filters { kv := strings.SplitN(f, "=", 2) if len(kv) != 2 { - return options, fmt.Errorf("Unupported filter syntax, please use help ls for details on correct usage.") + return options, fmt.Errorf("Unsupported filter syntax.") } key, value := kv[0], kv[1] From 6410da8f3470569b6dbe5aa730670dc9a4eaee70 Mon Sep 17 00:00:00 2001 From: Eric Sage Date: Mon, 13 Jul 2015 20:09:59 -0400 Subject: [PATCH 3/3] Switch to errors.New Signed-off-by: Eric Sage --- commands/ls.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commands/ls.go b/commands/ls.go index 1d3fb0bee8..0f927fcb67 100644 --- a/commands/ls.go +++ b/commands/ls.go @@ -1,6 +1,7 @@ package commands import ( + "errors" "fmt" "os" "strings" @@ -88,7 +89,7 @@ func parseFilters(filters []string) (FilterOptions, error) { for _, f := range filters { kv := strings.SplitN(f, "=", 2) if len(kv) != 2 { - return options, fmt.Errorf("Unsupported filter syntax.") + return options, errors.New("Unsupported filter syntax.") } key, value := kv[0], kv[1]