From c9ac9d9dd6d17e8fd81182980c39848eb5cd5b6e Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 9 Sep 2022 22:42:31 -0700 Subject: [PATCH] getModule: wrap errors, and don't panic (MR 22) --- main.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index e70ee2a..e5e6f36 100644 --- a/main.go +++ b/main.go @@ -729,13 +729,12 @@ func getModule(files misc.StringSet, modName string, modDir string) error { modDep := filepath.Join(modDir, "modules.dep") 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) if err != nil { - log.Print("Unable to open modules.dep: ", modDep) - return err + return fmt.Errorf("unable to open modules.dep: %w", err) } defer fd.Close() @@ -747,8 +746,7 @@ func getModule(files misc.StringSet, modName string, modDir string) error { for _, dep := range deps { p := filepath.Join(modDir, dep) if !exists(p) { - log.Printf("Tried to include a module that doesn't exist in the modules directory (%s): %s", modDir, p) - return err + return fmt.Errorf("Tried to include a module that doesn't exist in the modules directory (%s): %s", modDir, p) } files[p] = false }