summaryrefslogtreecommitdiffstats
path: root/lib/xdsserver
diff options
context:
space:
mode:
Diffstat (limited to 'lib/xdsserver')
-rw-r--r--lib/xdsserver/apiv1-config.go4
-rw-r--r--lib/xdsserver/apiv1-events.go4
-rw-r--r--lib/xdsserver/apiv1-exec.go6
-rw-r--r--lib/xdsserver/apiv1-folders.go4
-rw-r--r--lib/xdsserver/apiv1-make.go2
-rw-r--r--lib/xdsserver/apiv1-sdks.go4
-rw-r--r--lib/xdsserver/apiv1-targets.go4
-rw-r--r--lib/xdsserver/apiv1-updates.go2
-rw-r--r--lib/xdsserver/apiv1-version.go2
-rw-r--r--lib/xdsserver/events.go2
-rw-r--r--lib/xdsserver/folder-interface.go2
-rw-r--r--lib/xdsserver/folder-pathmap.go4
-rw-r--r--lib/xdsserver/folder-st-disable.go2
-rw-r--r--lib/xdsserver/folder-st.go4
-rw-r--r--lib/xdsserver/folders.go6
-rw-r--r--lib/xdsserver/sdk.go10
-rw-r--r--lib/xdsserver/sdks.go6
-rw-r--r--lib/xdsserver/target-interface.go2
-rw-r--r--lib/xdsserver/target-standard.go2
-rw-r--r--lib/xdsserver/targets.go6
-rw-r--r--lib/xdsserver/terminal-interface.go2
-rw-r--r--lib/xdsserver/terminal-ssh.go6
-rw-r--r--lib/xdsserver/terminals.go2
-rw-r--r--lib/xdsserver/xds-server-update.go6
-rw-r--r--lib/xdsserver/xdsserver.go6
25 files changed, 50 insertions, 50 deletions
diff --git a/lib/xdsserver/apiv1-config.go b/lib/xdsserver/apiv1-config.go
index 3bb58e4..96d9849 100644
--- a/lib/xdsserver/apiv1-config.go
+++ b/lib/xdsserver/apiv1-config.go
@@ -21,8 +21,8 @@ import (
"net/http"
"sync"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/apiv1-events.go b/lib/xdsserver/apiv1-events.go
index e2b0133..b30d128 100644
--- a/lib/xdsserver/apiv1-events.go
+++ b/lib/xdsserver/apiv1-events.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/apiv1-exec.go b/lib/xdsserver/apiv1-exec.go
index 46c8148..5efef2a 100644
--- a/lib/xdsserver/apiv1-exec.go
+++ b/lib/xdsserver/apiv1-exec.go
@@ -26,9 +26,9 @@ import (
"strings"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
"github.com/kr/pty"
)
diff --git a/lib/xdsserver/apiv1-folders.go b/lib/xdsserver/apiv1-folders.go
index cb03175..8d96634 100644
--- a/lib/xdsserver/apiv1-folders.go
+++ b/lib/xdsserver/apiv1-folders.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/apiv1-make.go b/lib/xdsserver/apiv1-make.go
index 226561b..b349a77 100644
--- a/lib/xdsserver/apiv1-make.go
+++ b/lib/xdsserver/apiv1-make.go
@@ -18,7 +18,7 @@
package xdsserver
import (
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/apiv1-sdks.go b/lib/xdsserver/apiv1-sdks.go
index a943da5..58154ab 100644
--- a/lib/xdsserver/apiv1-sdks.go
+++ b/lib/xdsserver/apiv1-sdks.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/apiv1-targets.go b/lib/xdsserver/apiv1-targets.go
index a7048eb..6520852 100644
--- a/lib/xdsserver/apiv1-targets.go
+++ b/lib/xdsserver/apiv1-targets.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/apiv1-updates.go b/lib/xdsserver/apiv1-updates.go
index 2b878a6..1b0092f 100644
--- a/lib/xdsserver/apiv1-updates.go
+++ b/lib/xdsserver/apiv1-updates.go
@@ -20,7 +20,7 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/apiv1-version.go b/lib/xdsserver/apiv1-version.go
index 754310a..2cf05b8 100644
--- a/lib/xdsserver/apiv1-version.go
+++ b/lib/xdsserver/apiv1-version.go
@@ -20,7 +20,7 @@ package xdsserver
import (
"net/http"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/events.go b/lib/xdsserver/events.go
index 0a02ecd..8844c5e 100644
--- a/lib/xdsserver/events.go
+++ b/lib/xdsserver/events.go
@@ -21,7 +21,7 @@ import (
"fmt"
"time"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
)
// EventDef Definition on one event
diff --git a/lib/xdsserver/folder-interface.go b/lib/xdsserver/folder-interface.go
index 8fdcdb9..65a2ed0 100644
--- a/lib/xdsserver/folder-interface.go
+++ b/lib/xdsserver/folder-interface.go
@@ -17,7 +17,7 @@
package xdsserver
-import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
// FolderEventCBData Data format of FolderEvent events
type FolderEventCBData map[string]interface{}
diff --git a/lib/xdsserver/folder-pathmap.go b/lib/xdsserver/folder-pathmap.go
index 8024331..5b75ca1 100644
--- a/lib/xdsserver/folder-pathmap.go
+++ b/lib/xdsserver/folder-pathmap.go
@@ -24,8 +24,8 @@ import (
"path/filepath"
"strings"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
)
diff --git a/lib/xdsserver/folder-st-disable.go b/lib/xdsserver/folder-st-disable.go
index f5e19d8..fb1def2 100644
--- a/lib/xdsserver/folder-st-disable.go
+++ b/lib/xdsserver/folder-st-disable.go
@@ -18,7 +18,7 @@
package xdsserver
import (
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
)
diff --git a/lib/xdsserver/folder-st.go b/lib/xdsserver/folder-st.go
index 9c89700..5b8fa8e 100644
--- a/lib/xdsserver/folder-st.go
+++ b/lib/xdsserver/folder-st.go
@@ -23,8 +23,8 @@ import (
"path/filepath"
"strings"
- st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/syncthing"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
"github.com/syncthing/syncthing/lib/config"
)
diff --git a/lib/xdsserver/folders.go b/lib/xdsserver/folders.go
index d27a329..5b3649e 100644
--- a/lib/xdsserver/folders.go
+++ b/lib/xdsserver/folders.go
@@ -26,9 +26,9 @@ import (
"strings"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/franciscocpg/reflectme"
"github.com/syncthing/syncthing/lib/sync"
)
diff --git a/lib/xdsserver/sdk.go b/lib/xdsserver/sdk.go
index 931db34..cda334c 100644
--- a/lib/xdsserver/sdk.go
+++ b/lib/xdsserver/sdk.go
@@ -26,9 +26,9 @@ import (
"strings"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/Sirupsen/logrus"
uuid "github.com/satori/go.uuid"
)
@@ -268,7 +268,7 @@ func (s *CrossSDK) Install(file string, force bool, timeout int, args []string,
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
- s.Log.Errorln("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
+ s.Log.Errorf("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
}
// IO socket can be nil when disconnected
@@ -311,7 +311,7 @@ func (s *CrossSDK) Install(file string, force bool, timeout int, args []string,
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
- s.Log.Errorln("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
+ s.Log.Errorf("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
}
s.Log.Infof("Command SDK ID %s [Cmd ID %s] exited: code %d, exitError: %v", sdkID[:16], e.CmdID, code, exitError)
diff --git a/lib/xdsserver/sdks.go b/lib/xdsserver/sdks.go
index 685f19d..1accc60 100644
--- a/lib/xdsserver/sdks.go
+++ b/lib/xdsserver/sdks.go
@@ -24,9 +24,9 @@ import (
"strings"
"sync"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
)
// SDKs List of installed SDK
diff --git a/lib/xdsserver/target-interface.go b/lib/xdsserver/target-interface.go
index 6d5bd7b..3cdb00d 100644
--- a/lib/xdsserver/target-interface.go
+++ b/lib/xdsserver/target-interface.go
@@ -17,7 +17,7 @@
package xdsserver
-import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
// ITARGET Target interface
type ITARGET interface {
diff --git a/lib/xdsserver/target-standard.go b/lib/xdsserver/target-standard.go
index 2c1b068..6369ac0 100644
--- a/lib/xdsserver/target-standard.go
+++ b/lib/xdsserver/target-standard.go
@@ -20,7 +20,7 @@ package xdsserver
import (
"fmt"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
)
diff --git a/lib/xdsserver/targets.go b/lib/xdsserver/targets.go
index ded3c1b..f3c58ee 100644
--- a/lib/xdsserver/targets.go
+++ b/lib/xdsserver/targets.go
@@ -24,9 +24,9 @@ import (
"os"
"strings"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/syncthing/syncthing/lib/sync"
)
diff --git a/lib/xdsserver/terminal-interface.go b/lib/xdsserver/terminal-interface.go
index 8542448..e19407b 100644
--- a/lib/xdsserver/terminal-interface.go
+++ b/lib/xdsserver/terminal-interface.go
@@ -18,7 +18,7 @@
package xdsserver
import (
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
socketio "github.com/googollee/go-socket.io"
)
diff --git a/lib/xdsserver/terminal-ssh.go b/lib/xdsserver/terminal-ssh.go
index fcef4f9..89a8b40 100644
--- a/lib/xdsserver/terminal-ssh.go
+++ b/lib/xdsserver/terminal-ssh.go
@@ -22,8 +22,8 @@ import (
"strings"
"time"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
socketio "github.com/googollee/go-socket.io"
uuid "github.com/satori/go.uuid"
)
@@ -224,7 +224,7 @@ func (t *TermSSH) Open(sock *socketio.Socket, sessID string) (*xsapiv1.TerminalC
// Close a terminal
func (t *TermSSH) Close() (*xsapiv1.TerminalConfig, error) {
// nothing to do when not open or closing
- if ! (t.termCfg.Status == xsapiv1.StatusTermOpen || t.termCfg.Status == xsapiv1.StatusTermClosing) {
+ if !(t.termCfg.Status == xsapiv1.StatusTermOpen || t.termCfg.Status == xsapiv1.StatusTermClosing) {
return &t.termCfg, nil
}
diff --git a/lib/xdsserver/terminals.go b/lib/xdsserver/terminals.go
index b52b351..17ab71a 100644
--- a/lib/xdsserver/terminals.go
+++ b/lib/xdsserver/terminals.go
@@ -20,7 +20,7 @@ package xdsserver
import (
"fmt"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/syncthing/syncthing/lib/sync"
)
diff --git a/lib/xdsserver/xds-server-update.go b/lib/xdsserver/xds-server-update.go
index cd9d6b1..0b18212 100644
--- a/lib/xdsserver/xds-server-update.go
+++ b/lib/xdsserver/xds-server-update.go
@@ -25,9 +25,9 @@ import (
sc "sync"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
)
const (
diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go
index e96ab57..b6c6f2f 100644
--- a/lib/xdsserver/xdsserver.go
+++ b/lib/xdsserver/xdsserver.go
@@ -26,9 +26,9 @@ import (
"syscall"
"time"
- st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/syncthing"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
)