From 7886fc9e8c709bc98705ed8811dd544b5d0b17cf Mon Sep 17 00:00:00 2001
From: androlo <andreas@erisindustries.com>
Date: Sun, 19 Jul 2015 14:51:47 +0200
Subject: [PATCH] re-installed some pakckages and did a new godep save
---
DOCKER/Dockerfile | 2 +-
Godeps/Godeps.json | 8 ++++----
.../gosnappy => google/go-snappy}/snappy/decode.go | 0
.../gosnappy => google/go-snappy}/snappy/encode.go | 0
.../gosnappy => google/go-snappy}/snappy/snappy.go | 0
.../gosnappy => google/go-snappy}/snappy/snappy_test.go | 0
.../github.com/syndtr/goleveldb/leveldb/table/reader.go | 2 +-
.../github.com/syndtr/goleveldb/leveldb/table/writer.go | 2 +-
8 files changed, 7 insertions(+), 7 deletions(-)
rename Godeps/_workspace/src/github.com/{syndtr/gosnappy => google/go-snappy}/snappy/decode.go (100%)
rename Godeps/_workspace/src/github.com/{syndtr/gosnappy => google/go-snappy}/snappy/encode.go (100%)
rename Godeps/_workspace/src/github.com/{syndtr/gosnappy => google/go-snappy}/snappy/snappy.go (100%)
rename Godeps/_workspace/src/github.com/{syndtr/gosnappy => google/go-snappy}/snappy/snappy_test.go (100%)
diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
index 785d4480..f9dd309c 100644
--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -45,7 +45,7 @@ RUN git clone --quiet https://$REPO . && \
ENV REPO $GOPATH/src/github.com/eris-ltd/eris-db
COPY . $REPO
WORKDIR $REPO
-RUN cd ./cmd/erisdb && go get -d && go build -o /usr/local/bin/erisdb && \
+RUN cd ./cmd/erisdb && go build -o /usr/local/bin/erisdb && \
cd ../erisdbss && go build -o /usr/local/bin/erisdbss && cd ../..
#-----------------------------------------------------------------------------
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index b0a272a0..c1ef66ea 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -24,6 +24,10 @@
"Comment": "v1.0rc1-104-g1a7ab6e",
"Rev": "1a7ab6e4d5fdc72d6df30ef562102ae6e0d18518"
},
+ {
+ "ImportPath": "github.com/google/go-snappy/snappy",
+ "Rev": "eaa750b9bf4dcb7cb20454be850613b66cda3273"
+ },
{
"ImportPath": "github.com/gorilla/websocket",
"Rev": "a3ec486e6a7a41858210b0fc5d7b5df593b3c4a3"
@@ -77,10 +81,6 @@
"ImportPath": "github.com/syndtr/goleveldb/leveldb",
"Rev": "a06509502ca32565bdf74afc1e573050023f261c"
},
- {
- "ImportPath": "github.com/syndtr/gosnappy/snappy",
- "Rev": "156a073208e131d7d2e212cb749feae7c339e846"
- },
{
"ImportPath": "github.com/tendermint/ed25519",
"Rev": "533fb6548e2071076888eda3c38749d707ba49bc"
diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/decode.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/decode.go
rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/decode.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/encode.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/encode.go
rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/encode.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy.go
rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy_test.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy_test.go
rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy_test.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go
index f89e6bcd..0ed58fb5 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go
@@ -14,7 +14,7 @@ import (
"strings"
"sync"
- "github.com/google/go-snappy/snappy"
+ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/google/go-snappy/snappy"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer"
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go
index e064e78f..f656f421 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go
@@ -12,7 +12,7 @@ import (
"fmt"
"io"
- "github.com/google/go-snappy/snappy"
+ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/google/go-snappy/snappy"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter"
--
GitLab