summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2016-01-08 02:58:39 +0100
committerChristian Pointner <equinox@spreadspace.org>2016-01-08 02:58:39 +0100
commit7dcd360b932e466907e20fa12a3d2ddc38b194b8 (patch)
tree4cdfcec1a760b886388ea8b64eb3ae6fc1516aac
parentimproved Makefile (diff)
uuid package has been moved to github
-rw-r--r--.gitignore3
-rw-r--r--src/hub/.gitignore1
-rw-r--r--src/hub/Makefile2
-rw-r--r--src/hub/src/spreadspace.org/sfive/s5store.go4
4 files changed, 4 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index c7b944e..e961147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
*.swp
*.swo
-/src/hub/src/github.com
-/src/hub/src/code.google.com
-/src/hub/src/honnef.co
diff --git a/src/hub/.gitignore b/src/hub/.gitignore
index ef448f2..ebd522b 100644
--- a/src/hub/.gitignore
+++ b/src/hub/.gitignore
@@ -1,3 +1,4 @@
+/src/github.com
/bin
/pkg
*.a
diff --git a/src/hub/Makefile b/src/hub/Makefile
index 9113f97..cd29c1c 100644
--- a/src/hub/Makefile
+++ b/src/hub/Makefile
@@ -40,7 +40,7 @@ EXECUTEABLE := sfive-hub
LIBS := "github.com/coopernurse/gorp" \
"github.com/mattn/go-sqlite3" \
"github.com/zenazn/goji" \
- "code.google.com/p/go-uuid/uuid" \
+ "github.com/pborman/uuid" \
"github.com/equinox0815/graphite-golang"
# "github.com/go-sql-driver/mysql"
# "github.com/ziutek/mymysql/godrv"
diff --git a/src/hub/src/spreadspace.org/sfive/s5store.go b/src/hub/src/spreadspace.org/sfive/s5store.go
index d30e365..efc6690 100644
--- a/src/hub/src/spreadspace.org/sfive/s5store.go
+++ b/src/hub/src/spreadspace.org/sfive/s5store.go
@@ -5,9 +5,9 @@ import (
"fmt"
"time"
- "code.google.com/p/go-uuid/uuid"
"github.com/coopernurse/gorp"
_ "github.com/mattn/go-sqlite3"
+ "github.com/pborman/uuid"
)
type sqliteStore struct {
@@ -512,7 +512,7 @@ func (s sqliteStore) GetLastUpdateForUuid(uuid string) (updateId *int, err error
func (s sqliteStore) GetLastUpdateId() (updateId *int, err error) {
result := lastUpdateQueryResult{}
- err = s.db.SelectOne(&result, "select max(Id) as MaxDataUpdateId from "+dataUpdatesTn,)
+ err = s.db.SelectOne(&result, "select max(Id) as MaxDataUpdateId from "+dataUpdatesTn)
if err == nil {
updateId = result.MaxDataUpdateId
} else {