Ability to rely on mtime, instead of ctime

[goredo.git] / run.go

diff --git a/run.go b/run.go
index a6401480d032f2b3c63536f9922084637942ac1f..551c0232eeb3f15e9d7c3d400075274d1a296c30 100644 (file)
--- a/run.go
+++ b/run.go
@@ -616,10 +616,9 @@ 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 := Err1WasTouched
                        if inodePrev == nil {
                                fd.Close()
-                               runErr.Err = errTouched
+                               runErr.Err = Err1WasTouched
                                errs <- runErr
                                return
                        }
@@ -631,7 +630,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                return
                        }
                        if !inode.Equals(inodePrev) {
-                               runErr.Err = errTouched
+                               runErr.Err = Err1WasTouched
                                errs <- runErr
                                return
                        }
@@ -731,6 +730,26 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                goto Finish
                        }
                }
+
+               // Post-commit .rec sanitizing
+               fdDep.Close()
+               if fdDepR, err := os.Open(fdDepPath); err == nil {
+                       depInfo, err := depRead(fdDepR)
+                       fdDepR.Close()
+                       if err != nil {
+                               goto Finish
+                       }
+                       ifchangeSeen := make(map[string]struct{}, len(depInfo.ifchanges))
+                       for _, dep := range depInfo.ifchanges {
+                               ifchangeSeen[dep["Target"]] = struct{}{}
+                       }
+                       for _, dep := range depInfo.ifcreates {
+                               if _, exists := ifchangeSeen[dep]; exists {
+                                       tracef(CWarn, "simultaneous ifcreate and ifchange records: %s", tgt)
+                               }
+                       }
+               }
+
        Finish:
                runErr.Err = err
                errs <- runErr