summaryrefslogtreecommitdiffstats
path: root/lib/syncthing
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2019-03-08 16:59:14 +0100
committerSebastien Douheret <sebastien.douheret@iot.bzh>2019-04-07 17:02:42 +0200
commit5dc2ff003106f0ced38caadb06033f24c792f9b9 (patch)
treef6fcd8e4daa1a2ac63d8ee013cc7beb385281176 /lib/syncthing
parentf001cf950bb91384f163bf8650c5d24f77c940f9 (diff)
Get ride of glide tool (marked as obsolete) and go module instead to populate dependency packages. See also: https://github.com/golang/go/wiki/Modules Bug-AGL: SPEC-2289 Change-Id: I8f459a9f80f501c2b6019566eaa3db3a9b986396 Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'lib/syncthing')
-rw-r--r--lib/syncthing/st.go4
-rw-r--r--lib/syncthing/stfolder.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 542f07a..7ac170b 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -36,8 +36,8 @@ import (
"regexp"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
"github.com/Sirupsen/logrus"
"github.com/syncthing/syncthing/lib/config"
)
diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 8a41968..ca001a3 100644
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -23,7 +23,7 @@ import (
"path/filepath"
"strings"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
stconfig "github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/protocol"
)
@@ -73,7 +73,7 @@ func (s *SyncThing) FolderChange(f xsapiv1.FolderConfig) (string, error) {
var label, id string
if id = f.ID; id == "" {
- s.log.Errorln("Try to create Syncthing folder with null ID: %v", f)
+ s.log.Errorf("Try to create Syncthing folder with null ID: %v", f)
return "", fmt.Errorf("Cannot create Syncthing folder (ID must be set")
}