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

lib/ignores: Fix ignore loading, report errors to UI (fixes #4901) (#4932)

Browse Source
This commit is contained in:
Audrius Butkevicius
2018-05-08 22:37:13 +01:00
committed by Jakob Borg
parent 2343c82c33
commit a48a31e3f5
3 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/model/model.go
View File

@@ -1490,11 +1490,10 @@ func (m *Model) GetIgnores(folder string) ([]string, []string, error) {
}
ignores, ok := m.folderIgnores[folder]
if ok {
return ignores.Lines(), ignores.Patterns(), nil
if !ok {
ignores = ignore.New(fs.NewFilesystem(cfg.FilesystemType, cfg.Path))
}
ignores = ignore.New(fs.NewFilesystem(cfg.FilesystemType, cfg.Path))
if err := ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) {
return nil, nil, err
}