From 7931af1078687329f7ab01219e211822b24a2720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Tue, 30 Mar 2021 21:24:53 +0200 Subject: [PATCH 1/2] lib/db: Fix comparison of pending folder timestamps (fixes #7532) (#7535) --- lib/db/observed.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/db/observed.go b/lib/db/observed.go index f7460e04b..45a116b8d 100644 --- a/lib/db/observed.go +++ b/lib/db/observed.go @@ -124,7 +124,7 @@ func (db *Lowlevel) RemovePendingFoldersBeforeTime(device protocol.DeviceID, old return nil, err } defer iter.Release() - oldest = oldest.Round(time.Second) + oldest = oldest.Truncate(time.Second) var res []string for iter.Next() { var of ObservedFolder From 13679284ac04c1e041f322e6f6ee8340c0aa33b4 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 6 Apr 2021 10:28:57 +0200 Subject: [PATCH 2/2] cmd/syncthing: Rename --conf back to --config This was inadvertently changed in the flag migration. --- cmd/syncthing/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 645099ab7..9c9e87b71 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -146,7 +146,7 @@ type serveOptions struct { Audit bool `help:"Write events to audit file"` AuditFile string `name:"auditfile" placeholder:"PATH" help:"Specify audit file (use \"-\" for stdout, \"--\" for stderr)"` BrowserOnly bool `help:"Open GUI in browser"` - ConfDir string `name:"conf" placeholder:"PATH" help:"Set configuration directory (config and keys)"` + ConfDir string `name:"config" placeholder:"PATH" help:"Set configuration directory (config and keys)"` DataDir string `name:"data" placeholder:"PATH" help:"Set data directory (database and logs)"` DeviceID bool `help:"Show the device ID"` GenerateDir string `name:"generate" placeholder:"PATH" help:"Generate key and config in specified dir, then exit"`