smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

getInitfsModules: wrap errors that are returned (MR 22)

Browse Source
This commit is contained in:
Clayton Craft
2022-09-09 22:58:39 -07:00
parent 1e00f8f1cc
commit c774b610d4
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main.go
View File

@@ -546,8 +546,7 @@ func getInitfsModules(devinfo deviceinfo.DeviceInfo, kernelVer string) (files []
dirs, _ := filepath.Glob(dir) dirs, _ := filepath.Glob(dir)
for _, d := range dirs { for _, d := range dirs {
if filelist, err := getModulesInDir(d); err != nil { if filelist, err := getModulesInDir(d); err != nil {
log.Print("Unable to get modules in dir: ", d) return nil, fmt.Errorf("getInitfsModules: unable to get modules dir %q: %w", d, err)
return nil, err
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
} }
@@ -555,8 +554,7 @@ func getInitfsModules(devinfo deviceinfo.DeviceInfo, kernelVer string) (files []
} else if dir == "" { } else if dir == "" {
// item is a module name // item is a module name
if filelist, err := getModule(file, modDir); err != nil { if filelist, err := getModule(file, modDir); err != nil {
log.Print("Unable to get module: ", file) return nil, fmt.Errorf("getInitfsModules: unable to get module %q: %w", file, err)
return nil, err
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
} }
@@ -568,8 +566,7 @@ func getInitfsModules(devinfo deviceinfo.DeviceInfo, kernelVer string) (files []
// deviceinfo modules // deviceinfo modules
for _, module := range strings.Fields(devinfo.ModulesInitfs) { for _, module := range strings.Fields(devinfo.ModulesInitfs) {
if filelist, err := getModule(module, modDir); err != nil { if filelist, err := getModule(module, modDir); err != nil {
log.Print("Unable to get modules from deviceinfo") return nil, fmt.Errorf("getInitfsModules: unable to get modules from deviceinfo: %w", err)
return nil, err
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
} }
@@ -580,15 +577,13 @@ func getInitfsModules(devinfo deviceinfo.DeviceInfo, kernelVer string) (files []
for _, modFile := range initfsModFiles { for _, modFile := range initfsModFiles {
f, err := os.Open(modFile) f, err := os.Open(modFile)
if err != nil { if err != nil {
log.Print("getInitfsModules: unable to open mkinitfs modules file: ", modFile) return nil, fmt.Errorf("getInitfsModules: unable to open mkinitfs modules file %q: %w", modFile, err)
return nil, err
} }
defer f.Close() defer f.Close()
s := bufio.NewScanner(f) s := bufio.NewScanner(f)
for s.Scan() { for s.Scan() {
if filelist, err := getModule(s.Text(), modDir); err != nil { if filelist, err := getModule(s.Text(), modDir); err != nil {
log.Print("getInitfsModules: unable to get module file: ", s.Text()) return nil, fmt.Errorf("getInitfsModules: unable to get module file %q: %w", s.Text(), err)
return nil, err
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
} }