octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Prevent localflag flipflopping on del. item (ref #6865) (#6919)

Browse Source
This commit is contained in:
Simon Frei 2020-08-21 10:09:48 +02:00 committed by GitHub
parent cc1f6e4d4a
commit b628460930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/model/folder.go
View File

@ -637,11 +637,11 @@ func (f *folder) scanSubdirs(subDirs []string) error {
l.Debugln("marking deleted item that doesn't exist anywhere as not receive-only", file)
batchAppend(file.ConvertDeletedToFileInfo(), snap)
changes++
case file.IsDeleted() && file.LocalFlags != f.localFlags:
// No need to bump the version for a file that was
// and is deleted and just the local flags changed.
file.LocalFlags = f.localFlags
l.Debugln("changing localflags on deleted item", file)
case file.IsDeleted() && file.IsReceiveOnlyChanged() && f.Type != config.FolderTypeReceiveOnly:
// No need to bump the version for a file that was and is
// deleted and just the folder type/local flags changed.
file.LocalFlags &^= protocol.FlagLocalReceiveOnly
l.Debugln("removing receive-only flag on deleted item", file)
batchAppend(file.ConvertDeletedToFileInfo(), snap)
changes++
}