浏览代码

lib/versioner: Interpret versions path relative to folder path (fixes #4188)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4243
Siyuan Liu 8 年之前
父节点
当前提交
03c678a810
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      lib/versioner/staggered.go

+ 5 - 2
lib/versioner/staggered.go

@@ -51,11 +51,14 @@ func NewStaggered(folderID, folderPath string, params map[string]string) Version
 	// Use custom path if set, otherwise .stversions in folderPath
 	var versionsDir string
 	if params["versionsPath"] == "" {
-		l.Debugln("using default dir .stversions")
 		versionsDir = filepath.Join(folderPath, ".stversions")
-	} else {
+		l.Debugln("using default dir .stversions")
+	} else if filepath.IsAbs(params["versionsPath"]) {
 		l.Debugln("using dir", params["versionsPath"])
 		versionsDir = params["versionsPath"]
+	} else {
+		versionsDir = filepath.Join(folderPath, params["versionsPath"])
+		l.Debugln("using dir", versionsDir)
 	}
 
 	s := &Staggered{