Parcourir la source

Re-add Flavor to KernelVersionInfo

Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Charles Lindsay il y a 11 ans
Parent
commit
b78ae3b652
1 fichiers modifiés avec 5 ajouts et 6 suppressions
  1. 5 6
      utils/utils.go

+ 5 - 6
utils/utils.go

@@ -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)
-	if err != nil {
-		return nil, err
-	}
+	parsed, _ = fmt.Sscanf(release, "%d.%d.%d%s", &kernel, &major, &minor, &flavor)
 	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
 }
 }