summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2016-01-08 03:09:01 +0100
committerChristian Pointner <equinox@spreadspace.org>2016-01-08 03:09:05 +0100
commit5a6cea203791485243ff21fd5ce19fa6862e0ab8 (patch)
treea078d66fd197e248a0a2ea8e9bee3a18d060a511
parentfixed formatting (diff)
grop has been moved to new repo
fixed errors from go vet
-rw-r--r--src/hub/Makefile2
-rw-r--r--src/hub/src/spreadspace.org/sfive/s5store.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/hub/Makefile b/src/hub/Makefile
index 939f265..91e96cd 100644
--- a/src/hub/Makefile
+++ b/src/hub/Makefile
@@ -37,7 +37,7 @@ TESTFLAG :=
EXECUTEABLE := sfive-hub
-LIBS := "github.com/coopernurse/gorp" \
+LIBS := "github.com/go-gorp/gorp" \
"github.com/mattn/go-sqlite3" \
"github.com/zenazn/goji" \
"github.com/pborman/uuid" \
diff --git a/src/hub/src/spreadspace.org/sfive/s5store.go b/src/hub/src/spreadspace.org/sfive/s5store.go
index efc6690..fb6181d 100644
--- a/src/hub/src/spreadspace.org/sfive/s5store.go
+++ b/src/hub/src/spreadspace.org/sfive/s5store.go
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
- "github.com/coopernurse/gorp"
+ "github.com/go-gorp/gorp"
_ "github.com/mattn/go-sqlite3"
"github.com/pborman/uuid"
)
@@ -76,7 +76,7 @@ func initDb(mysql bool, path string) (res *gorp.DbMap, hubId string, err error)
if err != nil {
return
}
- dialect = gorp.MySQLDialect{"InnoDB", "UTF8"}
+ dialect = gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8"}
} else {
db, err = sql.Open("sqlite3", path)
if err != nil {