Add information about error occurrence place

[goredo.git] / run.go

diff --git a/run.go b/run.go
index bb1efb0ad2526d4e7e6f05c2881dea55429ee2e8..90eb7e6ec1669c996efb04dd7a2c837b46cb2203 100644 (file)
--- a/run.go
+++ b/run.go
@@ -138,7 +138,7 @@ func isModified(cwd, redoDir, tgt string) (bool, *Inode, string, error) {
                if os.IsNotExist(err) {
                        return false, nil, "", nil
                }
-               return false, nil, "", err
+               return false, nil, "", ErrLine(err)
        }
        defer fdDep.Close()
        r := recfile.NewReader(fdDep)
@@ -151,7 +151,7 @@ func isModified(cwd, redoDir, tgt string) (bool, *Inode, string, error) {
                        if errors.Is(err, io.EOF) {
                                break
                        }
-                       return false, nil, "", err
+                       return false, nil, "", ErrLine(err)
                }
                if m["Type"] != DepTypeIfchange || m["Target"] != tgt {
                        continue
@@ -161,11 +161,11 @@ func isModified(cwd, redoDir, tgt string) (bool, *Inode, string, error) {
                        if os.IsNotExist(err) {
                                return false, nil, "", nil
                        }
-                       return false, nil, "", err
+                       return false, nil, "", ErrLine(err)
                }
                theirInode, err := inodeFromRec(m)
                if err != nil {
-                       return false, nil, "", err
+                       return false, nil, "", ErrLine(err)
                }
                hshPrev = m["Hash"]
                modified = !ourInode.Equals(theirInode)
@@ -188,7 +188,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        cwd, tgt := cwdAndTgt(tgtOrig)
        redoDir := path.Join(cwd, RedoDir)
        if err := mkdirs(redoDir); err != nil {
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
 
        shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgtOrig, cwd)
@@ -207,7 +207,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                os.FileMode(0666),
        )
        if err != nil {
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        flock := unix.Flock_t{
                Type:   unix.F_WRLCK,
@@ -227,7 +227,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        if err = unix.FcntlFlock(fdLock.Fd(), unix.F_SETLK, &flock); err != nil {
                if uintptr(err.(syscall.Errno)) != uintptr(unix.EAGAIN) {
                        fdLock.Close()
-                       return TgtError{tgtOrig, err}
+                       return TgtError{tgtOrig, ErrLine(err)}
                }
                Jobs.Add(1)
                if err = unix.FcntlFlock(fdLock.Fd(), unix.F_GETLK, &flock); err != nil {
@@ -318,7 +318,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        fdDep, err := tempfile(redoDir, tgt+DepSuffix)
        if err != nil {
                lockRelease()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        fdDepPath := fdDep.Name()
        cleanup := func() {
@@ -330,14 +330,14 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                recfile.Field{Name: "Build", Value: BuildUUID},
        ); err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
 
        // Find .do
        doFile, upLevels, err := findDo(fdDep, cwd, tgt)
        if err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        if doFile == "" {
                cleanup()
@@ -365,7 +365,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
 
        if err = depWrite(fdDep, cwdOrig, doFileRelPath, ""); err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        fdDep.Close()
        tracef(CWait, "%s", runErr.Name())
@@ -390,7 +390,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        fdStdout, err := tempfile(cwdOrig, tgt)
        if err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        stdoutPath := fdStdout.Name()
        fdStdout.Close()
@@ -452,7 +452,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                )
                if err != nil {
                        cleanup()
-                       return TgtError{tgtOrig, err}
+                       return TgtError{tgtOrig, ErrLine(err)}
                }
        }
        tracef(CDebug, "%s", shCtx)
@@ -563,11 +563,13 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                        var depInfo *DepInfo
                                        fdDep, err := os.Open(fdDepPath)
                                        if err != nil {
+                                               err = ErrLine(err)
                                                goto Err
                                        }
                                        depInfo, err = depRead(fdDep)
                                        fdDep.Close()
                                        if err != nil {
+                                               err = ErrLine(err)
                                                goto Err
                                        }
                                        for _, dep := range depInfo.ifchanges {
@@ -578,9 +580,10 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                        }
                                        _, err = recfile.NewWriter(w).WriteFields(fields...)
                                        if err != nil {
+                                               err = ErrLine(err)
                                                goto Err
                                        }
-                                       err = w.Flush()
+                                       err = ErrLine(w.Flush())
                                Err:
                                        if err != nil {
                                                log.Print(err)
@@ -698,7 +701,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                // Does it produce both stdout and tmp?
                fiStdout, err := os.Stat(fdStdout.Name())
                if err != nil {
-                       runErr.Err = err
+                       runErr.Err = ErrLine(err)
                        errs <- runErr
                        return
                }
@@ -712,7 +715,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        }
                        tmpExists = true
                } else if !os.IsNotExist(err) {
-                       runErr.Err = err
+                       runErr.Err = ErrLine(err)
                        errs <- runErr
                        return
                }
@@ -722,6 +725,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                if tmpExists {
                        fd, err = os.Open(tmpPath)
                        if err != nil {
+                               err = ErrLine(err)
                                goto Finish
                        }
                        defer fd.Close()
@@ -734,6 +738,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        os.Remove(path.Join(cwdOrig, tgt))
                        err = ifcreate(fdDep, tgt)
                        if err != nil {
+                               err = ErrLine(err)
                                goto Finish
                        }
                } else {
@@ -741,29 +746,31 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        if hshPrev != "" {
                                _, err = fd.Seek(0, io.SeekStart)
                                if err != nil {
+                                       err = ErrLine(err)
                                        goto Finish
                                }
                                hsh, err = fileHash(fd)
                                if err != nil {
+                                       err = ErrLine(err)
                                        goto Finish
                                }
                                if hsh == hshPrev {
                                        tracef(CDebug, "%s has same hash, not renaming", tgtOrig)
-                                       err = os.Remove(fd.Name())
+                                       err = ErrLine(os.Remove(fd.Name()))
                                        if err != nil {
                                                goto Finish
                                        }
-                                       err = os.Chtimes(path.Join(cwdOrig, tgt), finished, finished)
+                                       err = ErrLine(os.Chtimes(path.Join(cwdOrig, tgt), finished, finished))
                                        if err != nil {
                                                goto Finish
                                        }
                                        if !NoSync {
-                                               err = syncDir(cwdOrig)
+                                               err = ErrLine(syncDir(cwdOrig))
                                                if err != nil {
                                                        goto Finish
                                                }
                                        }
-                                       err = depWrite(fdDep, cwdOrig, tgt, hshPrev)
+                                       err = ErrLine(depWrite(fdDep, cwdOrig, tgt, hshPrev))
                                        if err != nil {
                                                goto Finish
                                        }
@@ -771,22 +778,22 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                }
                        }
                        if !NoSync {
-                               err = fd.Sync()
+                               err = ErrLine(fd.Sync())
                                if err != nil {
                                        goto Finish
                                }
                        }
-                       err = os.Rename(fd.Name(), path.Join(cwdOrig, tgt))
+                       err = ErrLine(os.Rename(fd.Name(), path.Join(cwdOrig, tgt)))
                        if err != nil {
                                goto Finish
                        }
                        if !NoSync {
-                               err = syncDir(cwdOrig)
+                               err = ErrLine(syncDir(cwdOrig))
                                if err != nil {
                                        goto Finish
                                }
                        }
-                       err = depWrite(fdDep, cwdOrig, tgt, hsh)
+                       err = ErrLine(depWrite(fdDep, cwdOrig, tgt, hsh))
                        if err != nil {
                                goto Finish
                        }
@@ -795,18 +802,18 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        RecCommit:
                // Commit .rec
                if !NoSync {
-                       err = fdDep.Sync()
+                       err = ErrLine(fdDep.Sync())
                        if err != nil {
                                goto Finish
                        }
                }
                fdDepPath = path.Join(redoDir, tgt+DepSuffix)
-               err = os.Rename(fdDep.Name(), fdDepPath)
+               err = ErrLine(os.Rename(fdDep.Name(), fdDepPath))
                if err != nil {
                        goto Finish
                }
                if !NoSync {
-                       err = syncDir(redoDir)
+                       err = ErrLine(syncDir(redoDir))
                        if err != nil {
                                goto Finish
                        }
@@ -818,6 +825,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        depInfo, err := depRead(fdDepR)
                        fdDepR.Close()
                        if err != nil {
+                               err = ErrLine(err)
                                goto Finish
                        }
                        ifchangeSeen := make(map[string]struct{}, len(depInfo.ifchanges))