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 (
if StderrKeep {
fdStderr, err = os.OpenFile(
path.Join(redoDir, tgt+LogSuffix),
- os.O_WRONLY|os.O_CREATE,
+ os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
os.FileMode(0666),
)
if err != nil {
cleanup()
return TgtErr{tgtOrig, err}
}
- fdStderr.Truncate(0)
}
shCtx := fmt.Sprintf(
"sh: %s: %s %s cwd:%s dirprefix:%s",
} 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))
}
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_WRONLY|os.O_CREATE|os.O_TRUNC,
os.FileMode(0666),
); err == nil {
- fdStderr.Truncate(0)
fields := []recfile.Field{
{Name: "Build", Value: BuildUUID},
{Name: "PID", Value: strconv.Itoa(cmd.Process.Pid)},
}
// 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)