diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-31 06:48:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 06:48:12 -0700 |
| commit | 9c1985fc4ee0a30a5a852dfbeae742e64978ed25 (patch) | |
| tree | 4e8c06a177369b88206e24f27d964f10b4bbc531 /cmd/podman | |
| parent | cf4288e3cc1cd95e512cae063066ca26917e378e (diff) | |
| parent | b2fef1a8badb875339d6329c095842baee4b3a17 (diff) | |
| download | podman-9c1985fc4ee0a30a5a852dfbeae742e64978ed25.tar.gz podman-9c1985fc4ee0a30a5a852dfbeae742e64978ed25.tar.bz2 podman-9c1985fc4ee0a30a5a852dfbeae742e64978ed25.zip | |
Merge pull request #1731 from afbjorklund/version
Fix setting of version information
Diffstat (limited to 'cmd/podman')
| -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)) } |