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

getModule: wrap errors, and don't panic (MR 22)

Browse Source
This commit is contained in:
Clayton Craft
2022-09-09 22:42:31 -07:00
parent a4927a8915
commit c9ac9d9dd6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@@ -729,13 +729,12 @@ func getModule(files misc.StringSet, modName string, modDir string) error {
modDep := filepath.Join(modDir, "modules.dep") modDep := filepath.Join(modDir, "modules.dep")
if !exists(modDep) { if !exists(modDep) {
log.Fatal("Kernel module.dep not found: ", modDir) return fmt.Errorf("kernel module.dep not found: %s", modDir)
} }
fd, err := os.Open(modDep) fd, err := os.Open(modDep)
if err != nil { if err != nil {
log.Print("Unable to open modules.dep: ", modDep) return fmt.Errorf("unable to open modules.dep: %w", err)
return err
} }
defer fd.Close() defer fd.Close()
@@ -747,8 +746,7 @@ func getModule(files misc.StringSet, modName string, modDir string) error {
for _, dep := range deps { for _, dep := range deps {
p := filepath.Join(modDir, dep) p := filepath.Join(modDir, dep)
if !exists(p) { if !exists(p) {
log.Printf("Tried to include a module that doesn't exist in the modules directory (%s): %s", modDir, p) return fmt.Errorf("Tried to include a module that doesn't exist in the modules directory (%s): %s", modDir, p)
return err
} }
files[p] = false files[p] = false
} }