octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-12 16:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4243
This commit is contained in:
Siyuan Liu 2017-07-03 14:50:51 +00:00 committed by Jakob Borg
parent b79f8aceb8
commit 03c678a810
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/versioner/staggered.go
View File

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