diff options
author | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2018-10-30 23:55:48 +0100 |
---|---|---|
committer | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2018-10-31 00:27:08 +0100 |
commit | b2fef1a8badb875339d6329c095842baee4b3a17 (patch) | |
tree | 42e9c0a95a03d90b1aea21fa45bc6efc7be12e21 /cmd | |
parent | aef9d56ae20e34447a69e19613629b8281a78502 (diff) | |
download | podman-b2fef1a8badb875339d6329c095842baee4b3a17.tar.gz podman-b2fef1a8badb875339d6329c095842baee4b3a17.tar.bz2 podman-b2fef1a8badb875339d6329c095842baee4b3a17.zip |
Fix setting of version information
It was setting the wrong variable (CamelCase)
in the wrong module ("main", not "libpod")...
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/podman/info.go | 3 | ||||
-rw-r--r-- | cmd/podman/version.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/info.go b/cmd/podman/info.go index 563e63ba3..c0639725e 100644 --- a/cmd/podman/info.go +++ b/cmd/podman/info.go @@ -81,6 +81,7 @@ func debugInfo(c *cli.Context) map[string]interface{} { info["compiler"] = runtime.Compiler info["go version"] = runtime.Version() info["podman version"] = c.App.Version - info["git commit"] = libpod.GitCommit + version, _ := libpod.GetVersion() + info["git commit"] = version.GitCommit return info } diff --git a/cmd/podman/version.go b/cmd/podman/version.go index f896229c4..d80f24a14 100644 --- a/cmd/podman/version.go +++ b/cmd/podman/version.go @@ -21,7 +21,7 @@ func versionCmd(c *cli.Context) error { fmt.Println("Git Commit: ", output.GitCommit) } // Prints out the build time in readable format - if libpod.BuildInfo != "" { + if output.Built != 0 { fmt.Println("Built: ", time.Unix(output.Built, 0).Format(time.ANSIC)) } |