X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=afeb353f43d002c727f6596d1786052c6ee7f47c;hb=e14100898b08c312919f58f712f19f623f602748;hp=c01ab80e10fe4b6ad232e1f8602f2499a9283dbc;hpb=f8a8a335216a6ec9aa6119d473d2f6aeb43958ca;p=goredo.git diff --git a/main.go b/main.go index c01ab80..afeb353 100644 --- a/main.go +++ b/main.go @@ -143,10 +143,11 @@ func main() { if Debug || os.Getenv(EnvLogPid) == "1" { MyPid = os.Getpid() } + var traced bool if *flagTrace { - Trace = true + traced = true } else { - Trace = os.Getenv(EnvTrace) == "1" + traced = os.Getenv(EnvTrace) == "1" } // Those are internal envs @@ -190,13 +191,13 @@ CmdSwitch: switch cmdName { case "redo": for _, tgt := range tgts { - ok, err = ifchange([]string{tgt}, true) + ok, err = ifchange([]string{tgt}, true, traced) if err != nil || !ok { break } } case "redo-ifchange": - ok, err = ifchange(tgts, false) + ok, err = ifchange(tgts, false, traced) writeDeps(fdDep, tgts) case "redo-ifcreate": if fdDep == nil { @@ -254,7 +255,10 @@ CmdSwitch: if err != nil { break } - fdTmp.Seek(0, 0) + _, err = fdTmp.Seek(0, 0) + if err != nil { + break + } r := recfile.NewReader(fdTmp) for { m, err := r.NextMap()