getHookFiles: wrap errors returned by this function

This commit is contained in:
Clayton Craft
2022-09-17 21:29:16 -07:00
parent c5f1cffca5
commit df0b5d66d7

View File

@@ -151,25 +151,26 @@ func exists(file string) bool {
func getHookFiles(filesdir string) (files []string, err error) { func getHookFiles(filesdir string) (files []string, err error) {
fileInfo, err := os.ReadDir(filesdir) fileInfo, err := os.ReadDir(filesdir)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("getHookFiles: unable to read hook file dir: %w", err)
} }
for _, file := range fileInfo { for _, file := range fileInfo {
path := filepath.Join(filesdir, file.Name()) path := filepath.Join(filesdir, file.Name())
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("getHookFiles: unable to open hook file: %w", err)
} }
defer f.Close() defer f.Close()
s := bufio.NewScanner(f) s := bufio.NewScanner(f)
for s.Scan() { for s.Scan() {
if filelist, err := getFiles([]string{s.Text()}, true); err != nil { if filelist, err := getFiles([]string{s.Text()}, true); err != nil {
return nil, fmt.Errorf("unable to find file %q required by %q", s.Text(), path) return nil, fmt.Errorf("getHookFiles: unable to find file %q required by %q", s.Text(), path)
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
} }
} }
if err := s.Err(); err != nil { if err := s.Err(); err != nil {
return nil, err return nil, fmt.Errorf("getHookFiles: uname to process hook file %q: %w", path, err)
} }
} }
return files, nil return files, nil