From 630f6c7fe10347d5e8d25351add706dcb1bfb76a Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Mon, 10 Dec 2018 03:00:26 +0000 Subject: [PATCH] Move all kernels generation to separate function --- pew.go | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pew.go b/pew.go index be72d98..a701316 100644 --- a/pew.go +++ b/pew.go @@ -334,6 +334,22 @@ func kernelMask(kernel string) (km config.KernelMask, err error) { return } +func genAllKernels() (sk []config.KernelMask, err error) { + for _, dType := range config.DistroTypeStrings { + var dt config.DistroType + dt, err = config.NewDistroType(dType) + if err != nil { + return + } + + sk = append(sk, config.KernelMask{ + DistroType: dt, + ReleaseMask: ".*", + }) + } + return +} + func pewHandler(kcfg config.KernelConfig, workPath, ovrrdKrnl, binary, test string, guess bool, qemuTimeout, dockerTimeout time.Duration) (err error) { @@ -358,16 +374,9 @@ func pewHandler(kcfg config.KernelConfig, } if guess { - ka.SupportedKernels = []config.KernelMask{} - for _, dType := range config.DistroTypeStrings { - var dt config.DistroType - dt, err = config.NewDistroType(dType) - if err != nil { - return - } - - km := config.KernelMask{DistroType: dt, ReleaseMask: ".*"} - ka.SupportedKernels = append(ka.SupportedKernels, km) + ka.SupportedKernels, err = genAllKernels() + if err != nil { + return } }