Просмотр исходного кода

Merge branch 'pr/903'

* pr/903:
  Ignore all paths within .stversions folder
Jakob Borg 11 лет назад
Родитель
Сommit
04b960b415
2 измененных файлов с 3 добавлено и 2 удалено
  1. BIN
      internal/model/testdata/.syncthing.file
  2. 3 2
      internal/scanner/walk.go

BIN
internal/model/testdata/.syncthing.file


+ 3 - 2
internal/scanner/walk.go

@@ -20,6 +20,7 @@ import (
 	"os"
 	"os"
 	"path/filepath"
 	"path/filepath"
 	"runtime"
 	"runtime"
+	"strings"
 
 
 	"code.google.com/p/go.text/unicode/norm"
 	"code.google.com/p/go.text/unicode/norm"
 
 
@@ -113,8 +114,8 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
 			return nil
 			return nil
 		}
 		}
 
 
-		if sn := filepath.Base(rn); sn == ".stignore" || sn == ".stversions" ||
-			sn == ".stfolder" || (w.Matcher != nil && w.Matcher.Match(rn)) {
+		if sn := filepath.Base(rn); sn == ".stignore" || sn == ".stfolder" ||
+			strings.HasPrefix(rn, ".stversions") || (w.Matcher != nil && w.Matcher.Match(rn)) {
 			// An ignored file
 			// An ignored file
 			if debug {
 			if debug {
 				l.Debugln("ignored:", rn)
 				l.Debugln("ignored:", rn)