Fix proper ifcreate relative paths

[goredo.git] / run.go

diff --git a/run.go b/run.go
index fe78a87e68198abb8f63d20383394a3f50c37121..ca8eebbcd9ca542dd7c9f31e77dfaca18eb4b7de 100644 (file)
--- a/run.go
+++ b/run.go
@@ -25,6 +25,7 @@ import (
        "flag"
        "fmt"
        "io"
+       "log"
        "os"
        "os/exec"
        "path"
@@ -51,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 (
@@ -383,14 +385,13 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
        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",
@@ -447,13 +448,12 @@ 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_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)},
@@ -476,8 +476,8 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                        for _, arg := range args {
                                                fields = append(fields, recfile.Field{Name: "Cmd", Value: arg})
                                        }
-                                       for _, e := range cmd.Env {
-                                               fields = append(fields, recfile.Field{Name: "Env", Value: e})
+                                       for _, env := range cmd.Env {
+                                               fields = append(fields, recfile.Field{Name: "Env", Value: env})
                                        }
                                        if exitErr != nil {
                                                fields = append(fields, recfile.Field{
@@ -486,12 +486,36 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                                })
                                        }
                                        w := bufio.NewWriter(fdStderr)
+
+                                       var depInfo *DepInfo
+                                       fdDep, err := os.Open(fdDepPath)
+                                       if err != nil {
+                                               goto Err
+                                       }
+                                       depInfo, err = depRead(fdDep)
+                                       fdDep.Close()
+                                       if err != nil {
+                                               goto Err
+                                       }
+                                       for _, dep := range depInfo.ifchanges {
+                                               fields = append(fields, recfile.Field{
+                                                       Name:  "Ifchange",
+                                                       Value: dep["Target"],
+                                               })
+                                       }
                                        _, err = recfile.NewWriter(w).WriteFields(fields...)
-                                       w.Flush()
-                                       fdStderr.Close()
                                        if err != nil {
+                                               goto Err
+                                       }
+                                       err = w.Flush()
+                               Err:
+                                       if err != nil {
+                                               log.Println(err)
                                                os.Remove(logRecPath)
                                        }
+                                       fdStderr.Close()
+                               } else {
+                                       log.Println("can not open", logRecPath, ":", err)
                                }
                        }
                        lockRelease()
@@ -556,15 +580,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                finished = time.Now()
                runErr.Finished = &finished
                if err != nil {
-                       // Try to commit .rec anyway
-                       if !NoSync {
-                               fdDep.Sync()
-                       }
-                       os.Rename(fdDep.Name(), path.Join(redoDir, tgt+DepSuffix))
-                       if !NoSync {
-                               err = syncDir(redoDir)
-                       }
-
                        exitErr = err.(*exec.ExitError)
                        runErr.Err = err
                        errs <- runErr
@@ -655,7 +670,8 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                goto Finish
                        }
                }
-               err = os.Rename(fdDep.Name(), path.Join(redoDir, tgt+DepSuffix))
+               fdDepPath = path.Join(redoDir, tgt+DepSuffix)
+               err = os.Rename(fdDep.Name(), fdDepPath)
                if err != nil {
                        goto Finish
                }