buildlog.go | 2 +- cleanup.go | 2 +- doc/news.texi | 9 +++++++++ run.go | 13 +++++++------ usage.go | 2 +- diff --git a/buildlog.go b/buildlog.go index b4e24e9032bae74c92876d09c7cf68a9ec3a6b4509c32d3e8d3cd47583dcfcdd..a47e441f35c75787e0612de6d5b3f768a2b09b9c4dbf2b65366ee1232aeb43a2 100644 --- a/buildlog.go +++ b/buildlog.go @@ -76,7 +76,7 @@ buildLogSeen = make(map[string]struct{}) } func parseBuildLogRec(dir, tgt string) (map[string][]string, error) { - fd, err := os.Open(path.Join(dir, RedoDir, tgt+LogSuffix+DepSuffix)) + fd, err := os.Open(path.Join(dir, RedoDir, tgt+LogRecSuffix)) if err != nil { return nil, err } diff --git a/cleanup.go b/cleanup.go index e6a1974cbc1a00e01ea0dcee38cc4156d82af595c097bd0b32f6207b5361eec3..de6cbc531b00f65a1b43e4274a23c8ce206505eed4e11290b8ce484b2bf809fe 100644 --- a/cleanup.go +++ b/cleanup.go @@ -66,7 +66,7 @@ pth = cwdMustRel(root, fi.Name()) switch what { case CleanupLog: if strings.HasSuffix(fi.Name(), LogSuffix) || - strings.HasSuffix(fi.Name(), LogSuffix+DepSuffix) { + strings.HasSuffix(fi.Name(), LogRecSuffix) { fmt.Println(pth) if !*DryRun { if err = os.Remove(pth); err != nil { diff --git a/doc/news.texi b/doc/news.texi index 2f8874e427d22d225b2a7a34fc63f7367805bfc54bfe0186725f6d802748e0ac..e10a50b536f3a21e5a09aff368aa4fc24852c10fe34fd87da35964c228709f01 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -1,6 +1,15 @@ @node News @unnumbered News +@anchor{Release 1_13_0} +@section Release 1.13.0 +@itemize +@item + Use @file{.log-rec} extension, instead of @file{.log.rec}, that + won't collide with already existing @file{.log} and @file{.rec} in + @file{.redo} directory. +@end itemize + @anchor{Release 1_12_0} @section Release 1.12.0 @itemize diff --git a/run.go b/run.go index 287e5cbf0939b2dca7fb77515c6fbd33d61b62283761a2e77f6e3f38886dfbe5..423bb7756667a61a14a25d097f6dafdf589205a5ba845c9753d316478d5acfd9 100644 --- a/run.go +++ b/run.go @@ -52,11 +52,12 @@ EnvStderrKeep = "REDO_LOGS" 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 ( @@ -447,7 +448,7 @@ fdDep.Close() 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_TRUNC, diff --git a/usage.go b/usage.go index 0b79daad6afeea9cae90c3c1cdff0919e88696a458118882467d3dc8b670aa58..33f60fb187639ae0bed659fd5021ec58bd491f1ef47cb1a8ee9d0408a554e2b2 100644 --- a/usage.go +++ b/usage.go @@ -24,7 +24,7 @@ "os" ) const ( - Version = "1.12.0" + Version = "1.13.0" Warranty = `Copyright (C) 2020-2021 Sergey Matveev This program is free software: you can redistribute it and/or modify