From e2e400e63cdce944d3e04dec015a770e39d3b10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 27 Feb 2020 00:13:13 +0100 Subject: [PATCH] Use proper import path go.etcd.io/bbolt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- backend/cache/storage_persistent.go | 2 +- go.mod | 3 +-- go.sum | 2 -- vendor/{github.com/etcd-io => go.etcd.io}/bbolt/.gitignore | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/.travis.yml | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/LICENSE | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/Makefile | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/README.md | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_386.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_amd64.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_arm.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_arm64.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_linux.go | 0 .../{github.com/etcd-io => go.etcd.io}/bbolt/bolt_mips64x.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_mipsx.go | 0 .../{github.com/etcd-io => go.etcd.io}/bbolt/bolt_openbsd.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_ppc.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_ppc64.go | 0 .../{github.com/etcd-io => go.etcd.io}/bbolt/bolt_ppc64le.go | 0 .../{github.com/etcd-io => go.etcd.io}/bbolt/bolt_riscv64.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_s390x.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_unix.go | 0 .../etcd-io => go.etcd.io}/bbolt/bolt_unix_solaris.go | 0 .../{github.com/etcd-io => go.etcd.io}/bbolt/bolt_windows.go | 0 .../{github.com/etcd-io => go.etcd.io}/bbolt/boltsync_unix.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bucket.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/cursor.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/db.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/doc.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/errors.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/freelist.go | 0 .../{github.com/etcd-io => go.etcd.io}/bbolt/freelist_hmap.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/node.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/page.go | 0 vendor/{github.com/etcd-io => go.etcd.io}/bbolt/tx.go | 0 vendor/modules.txt | 4 ++-- 36 files changed, 4 insertions(+), 7 deletions(-) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/.gitignore (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/.travis.yml (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/LICENSE (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/Makefile (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/README.md (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_386.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_amd64.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_arm.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_arm64.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_linux.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_mips64x.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_mipsx.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_openbsd.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_ppc.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_ppc64.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_ppc64le.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_riscv64.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_s390x.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_unix.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_unix_solaris.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bolt_windows.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/boltsync_unix.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/bucket.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/cursor.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/db.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/doc.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/errors.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/freelist.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/freelist_hmap.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/node.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/page.go (100%) rename vendor/{github.com/etcd-io => go.etcd.io}/bbolt/tx.go (100%) diff --git a/backend/cache/storage_persistent.go b/backend/cache/storage_persistent.go index 239dca02f..0c36a4649 100644 --- a/backend/cache/storage_persistent.go +++ b/backend/cache/storage_persistent.go @@ -16,10 +16,10 @@ import ( "sync" "time" - bolt "github.com/etcd-io/bbolt" "github.com/pkg/errors" "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/walk" + bolt "go.etcd.io/bbolt" ) // Constants diff --git a/go.mod b/go.mod index fb73b7a44..5104f598e 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/billziss-gh/cgofuse v1.2.0 github.com/djherbis/times v1.2.0 github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible - github.com/etcd-io/bbolt v1.3.3 github.com/google/go-querystring v1.0.0 // indirect github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect github.com/hanwen/go-fuse/v2 v2.0.3-0.20191108143333-152e6ac32d54 @@ -54,7 +53,7 @@ require ( github.com/xanzy/ssh-agent v0.2.1 github.com/youmark/pkcs8 v0.0.0-20191102193632-94c173a94d60 github.com/yunify/qingstor-sdk-go/v3 v3.2.0 - go.etcd.io/bbolt v1.3.3 // indirect + go.etcd.io/bbolt v1.3.3 goftp.io/server v0.3.2 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 diff --git a/go.sum b/go.sum index e248a3b40..fba59e59f 100644 --- a/go.sum +++ b/go.sum @@ -106,8 +106,6 @@ github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible/go.mod h1:lr+Lh github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= diff --git a/vendor/github.com/etcd-io/bbolt/.gitignore b/vendor/go.etcd.io/bbolt/.gitignore similarity index 100% rename from vendor/github.com/etcd-io/bbolt/.gitignore rename to vendor/go.etcd.io/bbolt/.gitignore diff --git a/vendor/github.com/etcd-io/bbolt/.travis.yml b/vendor/go.etcd.io/bbolt/.travis.yml similarity index 100% rename from vendor/github.com/etcd-io/bbolt/.travis.yml rename to vendor/go.etcd.io/bbolt/.travis.yml diff --git a/vendor/github.com/etcd-io/bbolt/LICENSE b/vendor/go.etcd.io/bbolt/LICENSE similarity index 100% rename from vendor/github.com/etcd-io/bbolt/LICENSE rename to vendor/go.etcd.io/bbolt/LICENSE diff --git a/vendor/github.com/etcd-io/bbolt/Makefile b/vendor/go.etcd.io/bbolt/Makefile similarity index 100% rename from vendor/github.com/etcd-io/bbolt/Makefile rename to vendor/go.etcd.io/bbolt/Makefile diff --git a/vendor/github.com/etcd-io/bbolt/README.md b/vendor/go.etcd.io/bbolt/README.md similarity index 100% rename from vendor/github.com/etcd-io/bbolt/README.md rename to vendor/go.etcd.io/bbolt/README.md diff --git a/vendor/github.com/etcd-io/bbolt/bolt_386.go b/vendor/go.etcd.io/bbolt/bolt_386.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_386.go rename to vendor/go.etcd.io/bbolt/bolt_386.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_amd64.go b/vendor/go.etcd.io/bbolt/bolt_amd64.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_amd64.go rename to vendor/go.etcd.io/bbolt/bolt_amd64.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_arm.go b/vendor/go.etcd.io/bbolt/bolt_arm.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_arm.go rename to vendor/go.etcd.io/bbolt/bolt_arm.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_arm64.go b/vendor/go.etcd.io/bbolt/bolt_arm64.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_arm64.go rename to vendor/go.etcd.io/bbolt/bolt_arm64.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_linux.go b/vendor/go.etcd.io/bbolt/bolt_linux.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_linux.go rename to vendor/go.etcd.io/bbolt/bolt_linux.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_mips64x.go b/vendor/go.etcd.io/bbolt/bolt_mips64x.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_mips64x.go rename to vendor/go.etcd.io/bbolt/bolt_mips64x.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_mipsx.go b/vendor/go.etcd.io/bbolt/bolt_mipsx.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_mipsx.go rename to vendor/go.etcd.io/bbolt/bolt_mipsx.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_openbsd.go b/vendor/go.etcd.io/bbolt/bolt_openbsd.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_openbsd.go rename to vendor/go.etcd.io/bbolt/bolt_openbsd.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_ppc.go b/vendor/go.etcd.io/bbolt/bolt_ppc.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_ppc.go rename to vendor/go.etcd.io/bbolt/bolt_ppc.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_ppc64.go b/vendor/go.etcd.io/bbolt/bolt_ppc64.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_ppc64.go rename to vendor/go.etcd.io/bbolt/bolt_ppc64.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_ppc64le.go b/vendor/go.etcd.io/bbolt/bolt_ppc64le.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_ppc64le.go rename to vendor/go.etcd.io/bbolt/bolt_ppc64le.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_riscv64.go b/vendor/go.etcd.io/bbolt/bolt_riscv64.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_riscv64.go rename to vendor/go.etcd.io/bbolt/bolt_riscv64.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_s390x.go b/vendor/go.etcd.io/bbolt/bolt_s390x.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_s390x.go rename to vendor/go.etcd.io/bbolt/bolt_s390x.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_unix.go b/vendor/go.etcd.io/bbolt/bolt_unix.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_unix.go rename to vendor/go.etcd.io/bbolt/bolt_unix.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_unix_solaris.go b/vendor/go.etcd.io/bbolt/bolt_unix_solaris.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_unix_solaris.go rename to vendor/go.etcd.io/bbolt/bolt_unix_solaris.go diff --git a/vendor/github.com/etcd-io/bbolt/bolt_windows.go b/vendor/go.etcd.io/bbolt/bolt_windows.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bolt_windows.go rename to vendor/go.etcd.io/bbolt/bolt_windows.go diff --git a/vendor/github.com/etcd-io/bbolt/boltsync_unix.go b/vendor/go.etcd.io/bbolt/boltsync_unix.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/boltsync_unix.go rename to vendor/go.etcd.io/bbolt/boltsync_unix.go diff --git a/vendor/github.com/etcd-io/bbolt/bucket.go b/vendor/go.etcd.io/bbolt/bucket.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/bucket.go rename to vendor/go.etcd.io/bbolt/bucket.go diff --git a/vendor/github.com/etcd-io/bbolt/cursor.go b/vendor/go.etcd.io/bbolt/cursor.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/cursor.go rename to vendor/go.etcd.io/bbolt/cursor.go diff --git a/vendor/github.com/etcd-io/bbolt/db.go b/vendor/go.etcd.io/bbolt/db.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/db.go rename to vendor/go.etcd.io/bbolt/db.go diff --git a/vendor/github.com/etcd-io/bbolt/doc.go b/vendor/go.etcd.io/bbolt/doc.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/doc.go rename to vendor/go.etcd.io/bbolt/doc.go diff --git a/vendor/github.com/etcd-io/bbolt/errors.go b/vendor/go.etcd.io/bbolt/errors.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/errors.go rename to vendor/go.etcd.io/bbolt/errors.go diff --git a/vendor/github.com/etcd-io/bbolt/freelist.go b/vendor/go.etcd.io/bbolt/freelist.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/freelist.go rename to vendor/go.etcd.io/bbolt/freelist.go diff --git a/vendor/github.com/etcd-io/bbolt/freelist_hmap.go b/vendor/go.etcd.io/bbolt/freelist_hmap.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/freelist_hmap.go rename to vendor/go.etcd.io/bbolt/freelist_hmap.go diff --git a/vendor/github.com/etcd-io/bbolt/node.go b/vendor/go.etcd.io/bbolt/node.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/node.go rename to vendor/go.etcd.io/bbolt/node.go diff --git a/vendor/github.com/etcd-io/bbolt/page.go b/vendor/go.etcd.io/bbolt/page.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/page.go rename to vendor/go.etcd.io/bbolt/page.go diff --git a/vendor/github.com/etcd-io/bbolt/tx.go b/vendor/go.etcd.io/bbolt/tx.go similarity index 100% rename from vendor/github.com/etcd-io/bbolt/tx.go rename to vendor/go.etcd.io/bbolt/tx.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 2ac83ab16..a7e8e167b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -90,8 +90,6 @@ github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/team_common github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/team_policies github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/users github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/users_common -# github.com/etcd-io/bbolt v1.3.3 -github.com/etcd-io/bbolt # github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e github.com/golang/groupcache/lru # github.com/golang/protobuf v1.3.3 @@ -216,6 +214,8 @@ github.com/yunify/qingstor-sdk-go/v3/request/signer github.com/yunify/qingstor-sdk-go/v3/request/unpacker github.com/yunify/qingstor-sdk-go/v3/service github.com/yunify/qingstor-sdk-go/v3/utils +# go.etcd.io/bbolt v1.3.3 +go.etcd.io/bbolt # go.opencensus.io v0.22.3 go.opencensus.io go.opencensus.io/internal