perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Pass the old not new fileinfo to deleteItemOnDisk (fixes #5654) (#5655)

Browse Source
This commit is contained in:
Simon Frei 2019-04-23 21:46:28 +02:00 committed by Audrius Butkevicius
parent d9b3415dec
commit 110806842c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/model/folder_sendrecv.go
View File

@ -581,7 +581,7 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo, dbUpdateChan chan<
return f.moveForConflict(name, file.ModifiedBy.String(), scanChan) return f.moveForConflict(name, file.ModifiedBy.String(), scanChan)
}, f.fs, curFile.Name) }, f.fs, curFile.Name)
} else { } else {
err = f.deleteItemOnDisk(file, scanChan) err = f.deleteItemOnDisk(curFile, scanChan)
} }
if err != nil { if err != nil {
f.newPullError(file.Name, err) f.newPullError(file.Name, err)
@ -737,7 +737,7 @@ func (f *sendReceiveFolder) handleSymlink(file protocol.FileInfo, dbUpdateChan c
return f.moveForConflict(name, file.ModifiedBy.String(), scanChan) return f.moveForConflict(name, file.ModifiedBy.String(), scanChan)
}, f.fs, curFile.Name) }, f.fs, curFile.Name)
} else { } else {
err = f.deleteItemOnDisk(file, scanChan) err = f.deleteItemOnDisk(curFile, scanChan)
} }
if err != nil { if err != nil {
f.newPullError(file.Name, errors.Wrap(err, "symlink remove")) f.newPullError(file.Name, errors.Wrap(err, "symlink remove"))