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: Clear folder error after loading ignores (fixes #8232) (#8238)

Browse Source
This commit is contained in:
Simon Frei 2022-03-27 21:29:40 +02:00 committed by GitHub
parent 0eca0ac45a
commit 55c513b827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/model/folder.go
View File

@ -382,7 +382,6 @@ func (f *folder) pull() (success bool, err error) {
l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err) l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err)
return false, err return false, err
} }
f.setError(nil)
// Send only folder doesn't do any io, it only checks for out-of-sync // Send only folder doesn't do any io, it only checks for out-of-sync
// items that differ in metadata and updates those. // items that differ in metadata and updates those.
@ -409,6 +408,7 @@ func (f *folder) pull() (success bool, err error) {
l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err) l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err)
return false, err return false, err
} }
f.setError(nil)
success, err = f.puller.pull() success, err = f.puller.pull()
@ -431,10 +431,6 @@ func (f *folder) scanSubdirs(subDirs []string) error {
err := f.getHealthErrorAndLoadIgnores() err := f.getHealthErrorAndLoadIgnores()
if err != nil { if err != nil {
// If there is a health error we set it as the folder error. We do not
// clear the folder error if there is no health error, as there might be
// an *other* folder error (failed to load ignores, for example). Hence
// we do not use the CheckHealth() convenience function here.
return err return err
} }
f.setError(nil) f.setError(nil)