github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 23:07:55 +00:00
Code Issues Projects Releases Wiki Activity

clh: Fix version check

Browse Source 
Add support for new version format from clh.

Fixes: #2489

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2020-02-20 20:07:32 +00:00
parent feac6648fa
commit 20332298ab
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
virtcontainers/clh.go
View File

@@ -675,6 +675,9 @@ func (clh *cloudHypervisor) getAvailableVersion() error {
}
// Remove 'v' prefix if has one
clh.Logger().Error("DEBUG :", versionSplit[0])
versionSplit[0] = strings.TrimLeft(versionSplit[0], "v")
major, err := strconv.ParseUint(versionSplit[0], 10, 64)
if err != nil {
return err
@@ -685,10 +688,14 @@ func (clh *cloudHypervisor) getAvailableVersion() error {
return err
}
revision, err := strconv.ParseUint(versionSplit[2], 10, 64)
revisionStr := strings.SplitN(versionSplit[2], "-", -1)
if len(revisionStr) < 1 {
return errors.Errorf("Failed parse clh revision %s", versionSplit[2])
}
revision, err := strconv.ParseUint(revisionStr[0], 10, 64)
if err != nil {
return err
}
clh.version = CloudHypervisorVersion{