X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=551c0232eeb3f15e9d7c3d400075274d1a296c30;hb=2cea0c64b5a0240bfe6746a98a5b350812edb96d;hp=3e6cd35fdbe5a3e41c2167b4436bca1f1840a7a6;hpb=b42c8c2dba5ea7667c32681338930969ed5c1cdb;p=goredo.git

diff --git a/run.go b/run.go
index 3e6cd35..551c023 100644
--- 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
 			}
@@ -683,7 +682,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 			fd = fdStdout
 		}
 
-		// Do we need to ifcreate it, of ifchange with renaming?
+		// Do we need to ifcreate it, or ifchange with renaming?
 		if fd == nil {
 			os.Remove(path.Join(cwdOrig, tgt))
 			err = ifcreate(fdDep, tgt)
@@ -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