X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fprojects.go;h=d5f809f0ce31a853f8e7db80639c6032350a31d7;hb=c2558601c7ce2b7fd7eaf7c2336fb78242781e50;hp=a0b641a67c51d59f0504a1e02a4deeec83aca428;hpb=9194f6c934ab3af0a559290b9299f6be2d9b2269;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/projects.go b/lib/agent/projects.go
index a0b641a..d5f809f 100644
--- a/lib/agent/projects.go
+++ b/lib/agent/projects.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,11 +25,12 @@ import (
 	"strings"
 	"time"
 
+	st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
+
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 	"github.com/franciscocpg/reflectme"
-	"github.com/iotbzh/xds-agent/lib/syncthing"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
 	"github.com/syncthing/syncthing/lib/sync"
 )
 
@@ -54,6 +55,7 @@ func NewProjects(ctx *Context, st *st.SyncThing) *Projects {
 
 // Init Load Projects configuration
 func (p *Projects) Init(server *XdsServer) error {
+
 	svrList := make(map[string]*XdsServer)
 	// If server not set, load for all servers
 	if server == nil {
@@ -75,6 +77,11 @@ func (p *Projects) Init(server *XdsServer) error {
 		for _, prj := range xFlds {
 			newP := svr.FolderToProject(prj)
 			if _, err := p.createUpdate(newP, false, true); err != nil {
+				// Don't consider that as an error (allow support config without CloudSync support)
+				if p.Context.SThg == nil && strings.Contains(err.Error(), "Server doesn't support project type CloudSync") {
+					continue
+				}
+
 				errMsg += "Error while creating project id " + prj.ID + ": " + err.Error() + "\n "
 				continue
 			}
@@ -162,6 +169,8 @@ func (p *Projects) Add(newP xaapiv1.ProjectConfig, fromSid, requestURL string) (
 		} else {
 			fd.WriteString("#export XDS_SDK_ID=???\n")
 		}
+		fd.WriteString("\n# Only disable reset of LD_LIBRARY_PATH if you are absolutely know what you are doing!\n")
+		fd.WriteString("export LD_LIBRARY_PATH=''\n")
 		fd.Close()
 	}
 
@@ -246,7 +255,7 @@ func (p *Projects) createUpdate(newF xaapiv1.ProjectConfig, create bool, initial
 	// Add to folders list
 	p.projects[newPrj.ID] = &fld
 
-	// Force sync after creation
+	// Force sync to get an initial sync status
 	// (need to defer to be sure that WS events will arrive after HTTP creation reply)
 	go func() {
 		time.Sleep(time.Millisecond * 500)