From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Sat, 7 Oct 2017 20:55:50 +0000 (+0200)
Subject: Bump Syncthing 0.14.38
X-Git-Tag: v1.0.0-rc1~23
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=1b9336d459474c76dc806757e7ddf49edfd65a33

Bump Syncthing 0.14.38
---

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 {