lib/model: Make the (?d) prefix actually work

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3205
This commit is contained in:
Audrius Butkevicius
2016-05-28 04:17:34 +00:00
committed by Jakob Borg
parent 242db26343
commit 92a23da3ec
2 changed files with 36 additions and 1 deletions

View File

@@ -678,7 +678,7 @@ func (f *rwFolder) deleteDir(file protocol.FileInfo, matcher *ignore.Matcher) {
for _, dirFile := range files {
fullDirFile := filepath.Join(file.Name, dirFile)
if defTempNamer.IsTemporary(dirFile) || (matcher != nil && matcher.Match(fullDirFile).IsDeletable()) {
osutil.RemoveAll(fullDirFile)
osutil.RemoveAll(filepath.Join(f.dir, fullDirFile))
}
}
dir.Close()