diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-13 22:44:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 22:44:17 +0200 |
| commit | 5cf64aee11063bc8e7ff22f1365b0bf6b3ab0900 (patch) | |
| tree | c4a66a89375113ae3d95bb79f84c48598f1de9c3 | |
| parent | 0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb (diff) | |
| parent | 11fa4b6eba21b6dd1cb331cc6fb2216f4b535988 (diff) | |
| download | podman-5cf64aee11063bc8e7ff22f1365b0bf6b3ab0900.tar.gz podman-5cf64aee11063bc8e7ff22f1365b0bf6b3ab0900.tar.bz2 podman-5cf64aee11063bc8e7ff22f1365b0bf6b3ab0900.zip | |
Merge pull request #5762 from baude/v2versionformat
podmanv2 version format variable name change
| -rw-r--r-- | cmd/podmanV2/system/version.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podmanV2/system/version.go b/cmd/podmanV2/system/version.go index e8002056b..8d6e8b7a8 100644 --- a/cmd/podmanV2/system/version.go +++ b/cmd/podmanV2/system/version.go @@ -24,7 +24,7 @@ var ( RunE: version, PersistentPreRunE: preRunE, } - format string + versionFormat string ) type versionStruct struct { @@ -38,7 +38,7 @@ func init() { Command: versionCommand, }) flags := versionCommand.Flags() - flags.StringVarP(&format, "format", "f", "", "Change the output format to JSON or a Go template") + flags.StringVarP(&versionFormat, "format", "f", "", "Change the output format to JSON or a Go template") } func version(cmd *cobra.Command, args []string) error { @@ -62,7 +62,7 @@ func version(cmd *cobra.Command, args []string) error { v.Server = v.Client //} - versionOutputFormat := format + versionOutputFormat := versionFormat if versionOutputFormat != "" { if strings.Join(strings.Fields(versionOutputFormat), "") == "{{json.}}" { versionOutputFormat = formats.JSONString |