Optimise reading of only Build metainformation

[goredo.git] / targets.go

diff --git a/targets.go b/targets.go
index dca27f4e7880626a383b56852942f5435e890997..6459a2db5529d9061ce393b044073f62e9c2ba71 100644 (file)
--- a/targets.go
+++ b/targets.go
@@ -21,18 +21,14 @@ import (
        "io"
        "os"
        "path"
-       "path/filepath"
        "strings"
 )
 
 func targetsCollect(root string, tgts map[string]struct{}) error {
-       root, err := filepath.Abs(root)
-       if err != nil {
-               panic(err)
-       }
+       root = mustAbs(root)
        dir, err := os.Open(root)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
        defer dir.Close()
        for {
@@ -41,7 +37,7 @@ func targetsCollect(root string, tgts map[string]struct{}) error {
                        if err == io.EOF {
                                break
                        }
-                       return err
+                       return ErrLine(err)
                }
                for _, entry := range entries {
                        if !entry.IsDir() {
@@ -51,12 +47,12 @@ func targetsCollect(root string, tgts map[string]struct{}) error {
                        if entry.Name() == RedoDir {
                                redoDir, err := os.Open(pth)
                                if err != nil {
-                                       return err
+                                       return ErrLine(err)
                                }
                                redoEntries, err := redoDir.ReadDir(0)
                                redoDir.Close()
                                if err != nil {
-                                       return err
+                                       return ErrLine(err)
                                }
                                for _, redoEntry := range redoEntries {
                                        name := redoEntry.Name()