]> Cypherpunks.ru repositories - goredo.git/blobdiff - sources.go
Add information about error occurrence place
[goredo.git] / sources.go
index ebfbcb9d9133e2d5ffa1fd09fb299f8c8dfe6c95..b7dcfd473d0add22302afd8560972b7000feb64c 100644 (file)
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,13 +37,13 @@ func sourcesWalker(tgts []string) ([]string, error) {
                        if os.IsNotExist(err) {
                                continue
                        }
-                       return nil, err
+                       return nil, ErrLine(err)
                }
                depInfo, err := depRead(fdDep)
+               fdDep.Close()
                if err != nil {
-                       return nil, err
+                       return nil, ErrLine(err)
                }
-               fdDep.Close()
                for _, m := range depInfo.ifchanges {
                        depTgt := m["Target"]
                        depTgtAbsPath, err := filepath.Abs(path.Join(cwd, depTgt))
@@ -55,7 +55,7 @@ func sourcesWalker(tgts []string) ([]string, error) {
                        } else if depTgtAbsPath != tgtAbsPath {
                                subSrcs, err := sourcesWalker([]string{cwdMustRel(depTgtAbsPath)})
                                if err != nil {
-                                       log.Fatalln(err)
+                                       log.Fatal(err)
                                }
                                for _, p := range subSrcs {
                                        seen[p] = struct{}{}