doc/download.texi | 4 ++++ doc/news.ru.texi | 9 +++++++++ doc/news.texi | 9 +++++++++ src/lockdir.go | 4 ++-- src/nncp.go | 2 +- src/tmp.go | 2 +- diff --git a/doc/download.texi b/doc/download.texi index 0b70ba73017bf021d3d9683d318c6682ab862fd69319094209925c7c739211be..7d408c483ce55b759d6de8138c4b623bee5ec93544d95e8b9ccc458378dfc32a 100644 --- a/doc/download.texi +++ b/doc/download.texi @@ -25,6 +25,10 @@ @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum +@item @ref{Release 6.2.0, 6.2.0} @tab 2021-03-07 @tab 1038 KiB +@tab @url{download/nncp-6.2.0.tar.xz, link} @url{download/nncp-6.2.0.tar.xz.sig, sign} +@tab @code{272CEDED 69FFF3B3 78767297 3199481A C610B753 BB82C22E ECEC45FC 05DA40FE} + @item @ref{Release 6.1.0, 6.1.0} @tab 2021-02-24 @tab 1040 KiB @tab @url{download/nncp-6.1.0.tar.xz, link} @url{download/nncp-6.1.0.tar.xz.sig, sign} @tab @code{083A533F 7D021206 9AE07F9F D6CD22E3 C5BE09E8 30F2C9C4 97D97CF6 14E5413F} diff --git a/doc/news.ru.texi b/doc/news.ru.texi index 909f03802b50cb072211f01576e932cf15475c5d4289b7b452ed1d851f82d61e..d66212632ebe328ff69d9ed6cff3684197988a39c9cdf660d7f2d3248452f242 100644 --- a/doc/news.ru.texi +++ b/doc/news.ru.texi @@ -1,6 +1,15 @@ @node Новости @section Новости +@node Релиз 6.2.1 +@subsection Релиз 6.2.1 +@itemize + +@item +В трёх местах сообщений журналов по ошибке остались лишние @code{%s}. + +@end itemize + @node Релиз 6.2.0 @subsection Релиз 6.2.0 @itemize diff --git a/doc/news.texi b/doc/news.texi index f4d51776d8979836ee9b71103f2d5bafc49c297e26df7f2ce8366163cafe6ebc..74e4c5dd9ab4dfadc67415122ebe72bc50967017d4c81043d8819f09e860f2c9 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -3,6 +3,15 @@ @unnumbered News See also this page @ref{Новости, on russian}. +@node Release 6.2.1 +@section Release 6.2.1 +@itemize + +@item +Three places in logs contained excess @code{%s}. + +@end itemize + @node Release 6.2.0 @section Release 6.2.0 @itemize diff --git a/src/lockdir.go b/src/lockdir.go index 762f990874c92824eb64202d4b4c7a79a87003a84bda896bccbc88b80bb21b3f..d81c975d4c33035fd5615c88e7a85fb43c93e96be01df8e2d423fde5b7c8b585 100644 --- a/src/lockdir.go +++ b/src/lockdir.go @@ -36,14 +36,14 @@ os.FileMode(0666), ) if err != nil { ctx.LogE("lockdir-open", LEs{{"Path", lockPath}}, err, func(les LEs) string { - return "Locking directory: opening %s" + lockPath + return "Locking directory: opening " + lockPath }) return nil, err } err = unix.Flock(int(dirLock.Fd()), unix.LOCK_EX|unix.LOCK_NB) if err != nil { ctx.LogE("lockdir-flock", LEs{{"Path", lockPath}}, err, func(les LEs) string { - return "Locking directory: locking %s" + lockPath + return "Locking directory: locking " + lockPath }) dirLock.Close() // #nosec G104 return nil, err diff --git a/src/nncp.go b/src/nncp.go index ff2dc39d9c5c4f2f6b27e17910b2261837b641ebc28f42e6dd20fe2f60244090..dd1ac260d984f156de6a64aefb49c97d7148d2e5cb805603b752b882d0d43ab2 100644 --- a/src/nncp.go +++ b/src/nncp.go @@ -40,7 +40,7 @@ const Base32Encoded32Len = 52 var ( - Version string = "6.2.0" + Version string = "6.2.1" Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding) ) diff --git a/src/tmp.go b/src/tmp.go index c223b70baad2a3234f0653bec01ffe219dbf3d5a8452092ddcaa357f8b248f63..6d818fdaeee5a0c563ddf88baeab997629aafd16e01e9bbb2947c4c067cd036f 100644 --- a/src/tmp.go +++ b/src/tmp.go @@ -46,7 +46,7 @@ } fd, err := TempFile(jobsPath, "") if err == nil { ctx.LogD("tmp", LEs{{"Src", fd.Name()}}, func(les LEs) string { - return "Temporary file created: %s" + fd.Name() + return "Temporary file created: " + fd.Name() }) } return fd, err