diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-02 14:49:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 14:49:02 -0400 |
| commit | f1cdead33d8f9c29348f9a66ba4a6aa5ed0aa7b2 (patch) | |
| tree | 1485fd4238fa9d3b8d64e1d13e54f0015300aeb7 /cmd/podman/parse/json.go | |
| parent | 1e162edc8a2dd3d8373128e671c578ffcad52272 (diff) | |
| parent | c0757374bf187edcf4ae8c4811e162e27794ebf8 (diff) | |
| download | podman-f1cdead33d8f9c29348f9a66ba4a6aa5ed0aa7b2.tar.gz podman-f1cdead33d8f9c29348f9a66ba4a6aa5ed0aa7b2.tar.bz2 podman-f1cdead33d8f9c29348f9a66ba4a6aa5ed0aa7b2.zip | |
Merge pull request #7199 from jwhonce/jira/run-898
Restore "table" --format from V1
Diffstat (limited to 'cmd/podman/parse/json.go')
| -rw-r--r-- | cmd/podman/parse/json.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/parse/json.go b/cmd/podman/parse/json.go index 95a6633b8..40ac415db 100644 --- a/cmd/podman/parse/json.go +++ b/cmd/podman/parse/json.go @@ -2,8 +2,9 @@ package parse import "regexp" -var jsonFormatRegex = regexp.MustCompile(`^(\s*json\s*|\s*{{\s*json\s*\.\s*}}\s*)$`) +var jsonFormatRegex = regexp.MustCompile(`^\s*(json|{{\s*json\s*( \.)?\s*}})\s*$`) +// MatchesJSONFormat test CLI --format string to be a JSON request func MatchesJSONFormat(s string) bool { return jsonFormatRegex.Match([]byte(s)) } |