Add information about error occurrence place

[goredo.git] / ood.go

diff --git a/ood.go b/ood.go
index b499041abe5edc91a0d859f590a9d23251d013ec..0c8d506b8ada12b827a8d7c7fba9dae028fbcb5a 100644 (file)
--- a/ood.go
+++ b/ood.go
@@ -150,7 +150,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
        depInfo, err := depRead(fdDep)
        fdDep.Close()
        if err != nil {
-               return true, TgtError{tgtOrig, err}
+               return true, TgtError{tgtOrig, ErrLine(err)}
        }
 
        if depInfo.build == BuildUUID {
@@ -200,7 +200,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
                                OODCache[path.Join(cwd, dep)] = ood
                                goto Done
                        }
-                       return ood, TgtError{tgtOrig, err}
+                       return ood, TgtError{tgtOrig, ErrLine(err)}
                }
 
                if inode.Size != theirInode.Size {
@@ -215,12 +215,12 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
                        tracef(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep)
                        fd, err := os.Open(path.Join(cwd, dep))
                        if err != nil {
-                               return ood, TgtError{tgtOrig, err}
+                               return ood, TgtError{tgtOrig, ErrLine(err)}
                        }
                        hsh, err := fileHash(fd)
                        fd.Close()
                        if err != nil {
-                               return ood, TgtError{tgtOrig, err}
+                               return ood, TgtError{tgtOrig, ErrLine(err)}
                        }
                        if theirHsh != hsh {
                                tracef(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep)
@@ -301,17 +301,17 @@ RecordOODTgt:
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err = FdOODTgts.Seek(0, io.SeekEnd); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err := FdOODTgts.WriteString(p + "\x00"); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        return true, nil
 }
@@ -323,13 +323,13 @@ func oodTgtsClear() {
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if err = FdOODTgts.Truncate(0); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
 }