1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #1041 from unclejack/fix_minor_kernel_version_for_git_kernels

remove + from minor kernel version for kernels built from git
This commit is contained in:
Guillaume J. Charmes 2013-06-27 15:21:34 -07:00
commit 750c94efbb

View file

@ -528,7 +528,9 @@ func GetKernelVersion() (*KernelVersionInfo, error) {
}
if len(tmp2) > 2 {
minor, err = strconv.Atoi(tmp2[2])
// Removes "+" because git kernels might set it
minorUnparsed := strings.Trim(tmp2[2], "+")
minor, err = strconv.Atoi(minorUnparsed)
if err != nil {
return nil, err
}