octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 07:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Fix regression deleting directories on pull (ref #5690) (#5691)

Browse Source
This commit is contained in:
Simon Frei 2019-05-06 20:55:26 +02:00 committed by Jakob Borg
parent 79e67b7f79
commit b45d77b6be
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/model/folder_sendrecv.go
View File

@ -513,13 +513,15 @@ func (f *sendReceiveFolder) processDeletions(fileDeletions map[string]protocol.F
} }
} }
for _, dir := range dirDeletions { // Process in reverse order to delete depth first
for i := range dirDeletions {
select { select {
case <-f.ctx.Done(): case <-f.ctx.Done():
return return
default: default:
} }
dir := dirDeletions[len(dirDeletions)-i-1]
f.resetPullError(dir.Name) f.resetPullError(dir.Name)
l.Debugln(f, "Deleting dir", dir.Name) l.Debugln(f, "Deleting dir", dir.Name)
f.deleteDir(dir, dbUpdateChan, scanChan) f.deleteDir(dir, dbUpdateChan, scanChan)