octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 23:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Don't mark globally deleted items as recv-only (fixes #6910) (#6911)

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

11
lib/model/folder.go
View File

@ -484,10 +484,11 @@ func (f *folder) scanSubdirs(subDirs []string) error {
// What we have locally is equivalent to the global file. // What we have locally is equivalent to the global file.
fi.Version = fi.Version.Merge(gf.Version) fi.Version = fi.Version.Merge(gf.Version)
fallthrough fallthrough
case fi.IsDeleted() && gf.IsReceiveOnlyChanged(): case fi.IsDeleted() && (gf.IsReceiveOnlyChanged() || gf.IsDeleted()):
// Our item is deleted and the global item is our own // Our item is deleted and the global item is our own
// receive only file. We can't delete file infos, so // receive only file or deleted too. In the former
// we just pretend it is a normal deleted file (nobody // case we can't delete file infos, so we just
// pretend it is a normal deleted file (nobody
// cares about that). // cares about that).
fi.LocalFlags &^= protocol.FlagLocalReceiveOnly fi.LocalFlags &^= protocol.FlagLocalReceiveOnly
} }
@ -624,10 +625,6 @@ func (f *folder) scanSubdirs(subDirs []string) error {
// sure the file gets in sync on the following pull. // sure the file gets in sync on the following pull.
nf.Version = protocol.Vector{} nf.Version = protocol.Vector{}
} }
// Check for deleted, locally changed items that noone else has.
if f.localFlags&protocol.FlagLocalReceiveOnly != 0 && len(snap.Availability(file.Name)) == 0 {
file.LocalFlags &^= protocol.FlagLocalReceiveOnly
}
l.Debugln("marking file as deleted", nf) l.Debugln("marking file as deleted", nf)
batchAppend(nf, snap) batchAppend(nf, snap)
changes++ changes++