From 17cbc16b08c13e5d99c23845ebda97cbcac57656 Mon Sep 17 00:00:00 2001 From: Charles Lindsay Date: Mon, 20 Jan 2014 21:03:09 -0800 Subject: [PATCH] Re-add Flavor to KernelVersionInfo Docker-DCO-1.1-Signed-off-by: Charles Lindsay (github: chazomaticus) Upstream-commit: b78ae3b652d609a895cf36886e053124d2f8ae80 Component: engine --- components/engine/utils/utils.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/components/engine/utils/utils.go b/components/engine/utils/utils.go index 0f05a24279..ae39bcac36 100644 --- a/components/engine/utils/utils.go +++ b/components/engine/utils/utils.go @@ -553,10 +553,11 @@ type KernelVersionInfo struct { Kernel int Major int Minor int + Flavor 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. @@ -610,13 +611,10 @@ func GetKernelVersion() (*KernelVersionInfo, error) { func ParseRelease(release string) (*KernelVersionInfo, error) { var ( kernel, major, minor, parsed int - err error + flavor string ) - parsed, err = fmt.Sscanf(release, "%d.%d.%d", &kernel, &major, &minor) - if err != nil { - return nil, err - } + parsed, _ = fmt.Sscanf(release, "%d.%d.%d%s", &kernel, &major, &minor, &flavor) if parsed < 3 { return nil, errors.New("Can't parse kernel version " + release) } @@ -625,6 +623,7 @@ func ParseRelease(release string) (*KernelVersionInfo, error) { Kernel: kernel, Major: major, Minor: minor, + Flavor: flavor, }, nil }