From c8457ab005f8856baeb918e6f44077442ae60047 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Mon, 15 Jun 2015 10:22:44 +0100 Subject: [PATCH] Voodoo --- internal/model/rwfolder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/model/rwfolder.go b/internal/model/rwfolder.go index 0213d9446..81489936f 100644 --- a/internal/model/rwfolder.go +++ b/internal/model/rwfolder.go @@ -643,7 +643,7 @@ func (p *rwFolder) deleteDir(file protocol.FileInfo) { if err == nil || os.IsNotExist(err) { // It was removed or it doesn't exist to start with p.dbUpdates <- file - } else if _, err := os.Lstat(realName); err != nil && !os.IsPermission(err) { + } else if _, serr := os.Lstat(realName); serr != nil && !os.IsPermission(serr) { // We get an error just looking at the directory, and it's not a // permission problem. Lets assume the error is in fact some variant // of "file does not exist" (possibly expressed as some parent being a @@ -691,7 +691,7 @@ func (p *rwFolder) deleteFile(file protocol.FileInfo) { if err == nil || os.IsNotExist(err) { // It was removed or it doesn't exist to start with p.dbUpdates <- file - } else if _, err := os.Lstat(realName); err != nil && !os.IsPermission(err) { + } else if _, serr := os.Lstat(realName); serr != nil && !os.IsPermission(serr) { // We get an error just looking at the file, and it's not a permission // problem. Lets assume the error is in fact some variant of "file // does not exist" (possibly expressed as some parent being a file and