octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Record error for unavailable files (#5066)

Browse Source
This commit is contained in:
Simon Frei 2018-07-14 15:09:23 +02:00 committed by Audrius Butkevicius
parent f822b10550
commit 5592b8b190
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/model/folder_sendrecv.go
View File

@ -66,6 +66,7 @@ var (
errDirHasToBeScanned = errors.New("directory contains unexpected files, scheduling scan") errDirHasToBeScanned = errors.New("directory contains unexpected files, scheduling scan")
errDirHasIgnored = errors.New("directory contains ignored files (see ignore documentation for (?d) prefix)") errDirHasIgnored = errors.New("directory contains ignored files (see ignore documentation for (?d) prefix)")
errDirNotEmpty = errors.New("directory is not empty") errDirNotEmpty = errors.New("directory is not empty")
errNotAvailable = errors.New("no connected device has the required version of this file")
) )
const ( const (
@ -318,8 +319,7 @@ func (f *sendReceiveFolder) processNeeded(ignores *ignore.Matcher, dbUpdateChan
changed++ changed++
case runtime.GOOS == "windows" && fs.WindowsInvalidFilename(file.Name): case runtime.GOOS == "windows" && fs.WindowsInvalidFilename(file.Name):
f.newError("need", file.Name, fs.ErrInvalidFilename) f.newError("pull", file.Name, fs.ErrInvalidFilename)
changed++
case file.IsDeleted(): case file.IsDeleted():
if file.IsDirectory() { if file.IsDirectory() {
@ -353,7 +353,7 @@ func (f *sendReceiveFolder) processNeeded(ignores *ignore.Matcher, dbUpdateChan
return true return true
} }
} }
l.Debugln(f, "Needed file is unavailable", file) f.newError("pull", file.Name, errNotAvailable)
case runtime.GOOS == "windows" && file.IsSymlink(): case runtime.GOOS == "windows" && file.IsSymlink():
file.SetUnsupported(f.shortID) file.SetUnsupported(f.shortID)