summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-10-07 22:55:50 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-11-06 15:57:04 +0100
commit1b9336d459474c76dc806757e7ddf49edfd65a33 (patch)
treeb1f17885904a1888d42a21704c1961dcff267fbd
parent76b949fbfca5a80d990048791ac1258fc8bb027d (diff)
Bump Syncthing 0.14.38
-rw-r--r--Makefile4
-rw-r--r--glide.yaml4
-rw-r--r--lib/syncthing/stfolder.go10
3 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index cc2f455..d546961 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
VERSION := 0.3.2
# Syncthing version to install
-SYNCTHING_VERSION = 0.14.28
-SYNCTHING_INOTIFY_VERSION = 0.8.6
+SYNCTHING_VERSION = 0.14.38
+SYNCTHING_INOTIFY_VERSION = 0.8.7
# Retrieve git tag/commit to set sub-version string
diff --git a/glide.yaml b/glide.yaml
index 08a3fed..94ef2db 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -9,7 +9,7 @@ import:
- package: github.com/gin-contrib/static
version: master
- package: github.com/syncthing/syncthing
- version: =0.14.28
+ version: =0.14.38
subpackages:
- lib/sync
- lib/config
@@ -25,7 +25,7 @@ import:
- package: github.com/satori/go.uuid
version: ^1.1.0
- package: github.com/iotbzh/xds-common
- version: 1bf428d6b4ba
+ version: ^0.1.0
subpackages:
- golib/common
- golib/eows
diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 70ac70a..5c570a5 100644
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -32,9 +32,9 @@ func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
}
for _, stFld := range stCfg.Folders {
- cliPath := strings.TrimPrefix(stFld.RawPath, s.conf.FileConf.ShareRootDir)
+ cliPath := strings.TrimPrefix(stFld.Path, s.conf.FileConf.ShareRootDir)
if cliPath == "" {
- cliPath = stFld.RawPath
+ cliPath = stFld.Path
}
*f = append(*f, folder.FolderConfig{
ID: stFld.ID,
@@ -96,9 +96,9 @@ func (s *SyncThing) FolderChange(f folder.FolderConfig) (string, error) {
}
folder := config.FolderConfiguration{
- ID: id,
- Label: label,
- RawPath: filepath.Join(s.conf.FileConf.ShareRootDir, f.ClientPath),
+ ID: id,
+ Label: label,
+ Path: filepath.Join(s.conf.FileConf.ShareRootDir, f.ClientPath),
}
if s.conf.FileConf.SThgConf.RescanIntervalS > 0 {