diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-21 13:23:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 13:23:20 +0000 |
| commit | 0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b (patch) | |
| tree | 41f8c9bb5802aff0b6482f67477a255308e7bc8b /cmd/podman | |
| parent | 84c87fc7d3315ffcc44dde2469a613cb9b5c4190 (diff) | |
| parent | c4b49afad37b4e64a1aa2b90f4d3b04626fabd44 (diff) | |
| download | podman-0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b.tar.gz podman-0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b.tar.bz2 podman-0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b.zip | |
Merge pull request #7696 from jwhonce/wip/version
Refactor version handling in cmd tree
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/root.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/version.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 8def7112f..6424ec12e 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -63,7 +63,7 @@ var ( PersistentPreRunE: persistentPreRunE, RunE: validate.SubCommandExists, PersistentPostRunE: persistentPostRunE, - Version: version.Version, + Version: version.Version.String(), } logLevels = []string{"debug", "info", "warn", "error", "fatal", "panic"} diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 5f39b4820..9da7da54a 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -83,7 +83,7 @@ func version(cmd *cobra.Command, args []string) error { func formatVersion(writer io.Writer, version *define.Version) { fmt.Fprintf(writer, "Version:\t%s\n", version.Version) - fmt.Fprintf(writer, "API Version:\t%d\n", version.APIVersion) + fmt.Fprintf(writer, "API Version:\t%s\n", version.APIVersion) fmt.Fprintf(writer, "Go Version:\t%s\n", version.GoVersion) if version.GitCommit != "" { fmt.Fprintf(writer, "Git Commit:\t%s\n", version.GitCommit) |