Always OOD unexistent targets

[goredo.git] / run.go

diff --git a/run.go b/run.go
index 1d1138b0287f07460afbdd0cf54dc6a9aceae08b..b836ad9982631d25b70c635f8d47daa01f2d56a8 100644 (file)
--- a/run.go
+++ b/run.go
@@ -52,11 +52,12 @@ const (
        EnvStderrSilent = "REDO_SILENT"
        EnvNoSync       = "REDO_NO_SYNC"
 
-       RedoDir    = ".redo"
-       LockSuffix = ".lock"
-       DepSuffix  = ".rec"
-       TmpPrefix  = ".redo."
-       LogSuffix  = ".log"
+       RedoDir      = ".redo"
+       LockSuffix   = ".lock"
+       DepSuffix    = ".rec"
+       TmpPrefix    = ".redo."
+       LogSuffix    = ".log"
+       LogRecSuffix = ".log-rec"
 )
 
 var (
@@ -407,10 +408,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                } else {
                        cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
                        cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
-                       cmd.Env = append(cmd.Env, fmt.Sprintf(
-                               "%s=%s %s%d,%d",
-                               MakeFlagsName, MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
-                       ))
+                       makeFlags := fmt.Sprintf(
+                               "%s %s%d,%d", MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
+                       )
+                       makeFlags = strings.Trim(makeFlags, " ")
+                       cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", MakeFlagsName, makeFlags))
                        fdNum += 2
                        cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvJSToken, jsToken))
                }
@@ -447,7 +449,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                        fdStdout.Close()
                        if fdStderr != nil {
                                fdStderr.Close()
-                               logRecPath := path.Join(redoDir, tgt+LogSuffix+DepSuffix)
+                               logRecPath := path.Join(redoDir, tgt+LogRecSuffix)
                                if fdStderr, err = os.OpenFile(
                                        logRecPath,
                                        os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
@@ -586,6 +588,29 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                }
 
                // Was $1 touched?
+               if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+                       errTouched := errors.New("$1 was explicitly touched")
+                       if inodePrev == nil {
+                               fd.Close()
+                               runErr.Err = errTouched
+                               errs <- runErr
+                               return
+                       } else {
+                               inode, err := inodeFromFile(fd)
+                               fd.Close()
+                               if err != nil {
+                                       runErr.Err = err
+                                       errs <- runErr
+                                       return
+                               }
+                               if !inode.Equals(inodePrev) {
+                                       runErr.Err = errTouched
+                                       errs <- runErr
+                                       return
+                               }
+                       }
+               }
+
                if inodePrev != nil {
                        if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
                                inode, err := inodeFromFile(fd)