Merge pull request containers#9274 from baude/bz1925928

Fix varlink GetVersion()
giuseppe · Feb 8, 2021 · 82e4e66 · 82e4e66
2 parents 1741f15 + 8ef5a03
commit 82e4e66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libpod/define/version.go b/libpod/define/version.go
@@ -42,7 +42,7 @@ func GetVersion() (Version, error) {
 		}
 	}
 	return Version{
-		APIVersion: podmanVersion.APIVersion.String(),
+		APIVersion: strconv.Itoa(int(podmanVersion.APIVersion.Major)),
 		Version:    podmanVersion.Version.String(),
 		GoVersion:  runtime.Version(),
 		GitCommit:  gitCommit,

diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
@@ -20,12 +20,12 @@ import (
 func (i *VarlinkAPI) GetVersion(call iopodman.VarlinkCall) error {
 	versionInfo, err := define.GetVersion()
 	if err != nil {
-		return err
+		return call.ReplyErrorOccurred(err.Error())
 	}
 
 	int64APIVersion, err := strconv.ParseInt(versionInfo.APIVersion, 10, 64)
 	if err != nil {
-		return err
+		return call.ReplyErrorOccurred(err.Error())
 	}
 
 	return call.ReplyGetVersion(