EnvStderrKeep = "REDO_LOGS"
EnvStderrSilent = "REDO_SILENT"
EnvNoSync = "REDO_NO_SYNC"
+ EnvStampPrev = "REDO_STAMP_PREV"
RedoDir = ".redo"
LockSuffix = ".lock"
StderrKeep bool = false
StderrSilent bool = false
StderrPrefix string
+ StampPrev string
flagTrace = flag.Bool("x", false, "trace current target (sh -x) (set REDO_TRACE=1 for others too)")
flagStderrKeep = flag.Bool("logs", false, "keep job's stderr (REDO_LOGS=1)")
return err
}
-func runScript(tgtOrig string, errs chan error) error {
+func runScript(tgtOrig string, errs chan error, stampPrev string) error {
cwd, tgt := cwdAndTgt(tgtOrig)
redoDir := path.Join(cwd, RedoDir)
if err := mkdirs(redoDir); err != nil {
unix.Flock(int(fdLock.Fd()), unix.LOCK_EX)
lockRelease()
trace(CDebug, "waiting done: %s", tgtOrig)
- var builtNow bool
+ var depInfo *DepInfo
fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
if err != nil {
if os.IsNotExist(err) {
- err = errors.New("was not built")
+ err = errors.New("was not built: no .dep")
}
goto Finish
}
- builtNow, _, err = isBuiltNow(fdDep)
+ defer fdDep.Close()
+ depInfo, err = depRead(fdDep)
if err != nil {
goto Finish
}
- if !builtNow {
- err = errors.New("was not built")
+ if depInfo.build != BuildUUID {
+ err = errors.New("was not built: build differs")
}
Finish:
if err != nil {
cmd.Env = append(os.Environ(), fmt.Sprintf("%s=%d", EnvLevel, Level+1))
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDirPrefix, dirPrefix))
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvBuildUUID, BuildUUID))
+
+ if stampPrev != "" {
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvStampPrev, stampPrev))
+ }
+
childStderrPrefix := tempsuffix()
cmd.Env = append(cmd.Env, fmt.Sprintf(
"%s=%s", EnvStderrPrefix, childStderrPrefix,