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 /libpod | |
| 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 'libpod')
| -rw-r--r-- | libpod/version.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/version.go b/libpod/version.go index 5e7cd83c9..966588ae9 100644 --- a/libpod/version.go +++ b/libpod/version.go @@ -11,10 +11,10 @@ import ( var ( // GitCommit is the commit that the binary is being built from. // It will be populated by the Makefile. - GitCommit string + gitCommit string // BuildInfo is the time at which the binary was built // It will be populated by the Makefile. - BuildInfo string + buildInfo string ) //Version is an output struct for varlink @@ -30,9 +30,9 @@ type Version struct { func GetVersion() (Version, error) { var err error var buildTime int64 - if BuildInfo != "" { + if buildInfo != "" { // Converts unix time from string to int64 - buildTime, err = strconv.ParseInt(BuildInfo, 10, 64) + buildTime, err = strconv.ParseInt(buildInfo, 10, 64) if err != nil { return Version{}, err @@ -41,7 +41,7 @@ func GetVersion() (Version, error) { return Version{ Version: podmanVersion.Version, GoVersion: runtime.Version(), - GitCommit: GitCommit, + GitCommit: gitCommit, Built: buildTime, OsArch: runtime.GOOS + "/" + runtime.GOARCH, }, nil |