perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2354 from eipiminus1/issue1361

Browse Source 
Add trailing folder seperator to allow symlinks as folder path (fixes #1361)
This commit is contained in:
Jakob Borg
2015-10-16 09:29:37 +09:00
parent cc436dc8cb 054bc970e2
commit e15be5c2bf
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/config/config.go
View File

@@ -424,6 +424,9 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
// This way in the tests, we get away without OS specific separators // This way in the tests, we get away without OS specific separators
// in the test configs. // in the test configs.
folder.RawPath = filepath.Dir(folder.RawPath + string(filepath.Separator)) folder.RawPath = filepath.Dir(folder.RawPath + string(filepath.Separator))
if folder.RawPath[len(folder.RawPath)-1] != filepath.Separator {
folder.RawPath = folder.RawPath + string(filepath.Separator)
}
if folder.ID == "" { if folder.ID == "" {
folder.ID = "default" folder.ID = "default"

4
lib/config/config_test.go
View File

@@ -91,7 +91,7 @@ func TestDeviceConfig(t *testing.T) {
expectedFolders := []FolderConfiguration{ expectedFolders := []FolderConfiguration{
{ {
ID: "test", ID: "test",
RawPath: "testdata", RawPath: "testdata" + string(filepath.Separator),
Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}}, Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}},
ReadOnly: true, ReadOnly: true,
RescanIntervalS: 600, RescanIntervalS: 600,
@@ -326,7 +326,7 @@ func TestIssue1262(t *testing.T) {
} }
actual := cfg.Folders()["test"].RawPath actual := cfg.Folders()["test"].RawPath
expected := "e:" expected := "e:/"
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
expected = `e:\` expected = `e:\`
} }