summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorAnders F Björklund <anders.f.bjorklund@gmail.com>2018-10-30 23:55:48 +0100
committerAnders F Björklund <anders.f.bjorklund@gmail.com>2018-10-31 00:27:08 +0100
commitb2fef1a8badb875339d6329c095842baee4b3a17 (patch)
tree42e9c0a95a03d90b1aea21fa45bc6efc7be12e21 /pkg
parentaef9d56ae20e34447a69e19613629b8281a78502 (diff)
downloadpodman-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 'pkg')
-rw-r--r--pkg/varlinkapi/system.go13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
index 287f42209..a29d22e7d 100644
--- a/pkg/varlinkapi/system.go
+++ b/pkg/varlinkapi/system.go
@@ -34,6 +34,10 @@ func (i *LibpodAPI) Ping(call iopodman.VarlinkCall) error {
// GetInfo returns details about the podman host and its stores
func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error {
+ versionInfo, err := libpod.GetVersion()
+ if err != nil {
+ return err
+ }
var (
registries, insecureRegistries []string
)
@@ -64,11 +68,10 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error {
podmanInfo.Host = infoHost
store := info[1].Data
pmaninfo := iopodman.InfoPodmanBinary{
- Compiler: goruntime.Compiler,
- Go_version: goruntime.Version(),
- // TODO : How are we going to get this here?
- //Podman_version:
- Git_commit: libpod.GitCommit,
+ Compiler: goruntime.Compiler,
+ Go_version: goruntime.Version(),
+ Podman_version: versionInfo.Version,
+ Git_commit: versionInfo.GitCommit,
}
graphStatus := iopodman.InfoGraphStatus{