docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-add Flavor to KernelVersionInfo 

Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
This commit is contained in:
Charles Lindsay 2014-01-20 21:03:09 -08:00
parent 5b97e00438
commit b78ae3b652
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/utils.go
View File

@ -553,10 +553,11 @@ type KernelVersionInfo struct {
Kernel int Kernel int
Major int Major int
Minor int Minor int
Flavor string
} }
func (k *KernelVersionInfo) String() string { func (k *KernelVersionInfo) String() string {
return fmt.Sprintf("%d.%d.%d", k.Kernel, k.Major, k.Minor) return fmt.Sprintf("%d.%d.%d%s", k.Kernel, k.Major, k.Minor, k.Flavor)
} }
// Compare two KernelVersionInfo struct. // Compare two KernelVersionInfo struct.
@ -610,13 +611,10 @@ func GetKernelVersion() (*KernelVersionInfo, error) {
func ParseRelease(release string) (*KernelVersionInfo, error) { func ParseRelease(release string) (*KernelVersionInfo, error) {
var ( var (
kernel, major, minor, parsed int kernel, major, minor, parsed int
err error flavor string
) )
parsed, err = fmt.Sscanf(release, "%d.%d.%d", &kernel, &major, &minor) parsed, _ = fmt.Sscanf(release, "%d.%d.%d%s", &kernel, &major, &minor, &flavor)
if err != nil {
return nil, err
}
if parsed < 3 { if parsed < 3 {
return nil, errors.New("Can't parse kernel version " + release) return nil, errors.New("Can't parse kernel version " + release)
} }
@ -625,6 +623,7 @@ func ParseRelease(release string) (*KernelVersionInfo, error) {
Kernel: kernel, Kernel: kernel,
Major: major, Major: major,
Minor: minor, Minor: minor,
Flavor: flavor,
}, nil }, nil
} }