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

Model.internalScanFolder: Don't ignore special .stfolder and .stignore files.

Browse Source 
Fixes #2151.

Since Walk.walkAndHashFiles ignores .stfolder and .stignore, they will
never be found by fs.Get(protocol.LocalDeviceID, sub) in
Model.internalScanFolder. As a result, when asked to scan those subs
we end up scanning the whole folder.
This commit is contained in:
Michael Ploujnikov
2016-01-22 22:37:58 -05:00
parent 6c33188af3
commit 49601a63c8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/model.go
View File

@@ -1323,7 +1323,7 @@ func (m *Model) internalScanFolderSubs(folder string, subs []string) error {
var unifySubs []string var unifySubs []string
nextSub: nextSub:
for _, sub := range subs { for _, sub := range subs {
for sub != "" { for sub != "" && sub != ".stfolder" && sub != ".stignore" {
if _, ok = fs.Get(protocol.LocalDeviceID, sub); ok { if _, ok = fs.Get(protocol.LocalDeviceID, sub); ok {
break break
} }