Merge remote-tracking branch 'origin/v1.52-stable' (Fix)

mawaya · Jun 28, 2020 · 4b74b41 · 4b74b41
1 parent 1c169b8
commit 4b74b41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/backend/drive/drive.go b/backend/drive/drive.go
@@ -1387,6 +1387,7 @@ func NewFs(name, path string, m configmap.Mapper) (fs.Fs, error) {
 				f.pacer = newPacer(opt)
 			}
 		}
+	}
 
 	// If impersonating warn about root_folder_id if set and unset it
 	//
@@ -2049,7 +2050,7 @@ func (f *Fs) listRRunner(ctx context.Context, wg *sync.WaitGroup, in chan listRE
 			// the listR runners if they all get here
 			wg.Add(len(recycled))
 			go func() {
-				defer func(){
+				defer func() {
 					recover()
 				}()
 				for _, entry := range recycled {

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -253,8 +253,6 @@ github.com/skratchdot/open-golang/open
 ## explicit
 # github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
 ## explicit
-# github.com/spacemonkeygo/errors v0.0.0-20171212215202-9064522e9fd1
-github.com/spacemonkeygo/errors
 # github.com/spacemonkeygo/monkit/v3 v3.0.7-0.20200515175308-072401d8c752
 github.com/spacemonkeygo/monkit/v3
 github.com/spacemonkeygo/monkit/v3/monotime
@@ -272,7 +270,7 @@ github.com/stretchr/testify/require
 # github.com/t3rm1n4l/go-mega v0.0.0-20200117211730-79a813bb328d
 ## explicit
 github.com/t3rm1n4l/go-mega
-# github.com/vivint/infectious v0.0.0-20190108171102-2455b059135b
+# github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3
 github.com/vivint/infectious
 # github.com/xanzy/ssh-agent v0.2.1
 ## explicit
@@ -381,7 +379,7 @@ golang.org/x/oauth2/jwt
 ## explicit
 golang.org/x/sync/errgroup
 golang.org/x/sync/semaphore
-# golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae
+# golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
 ## explicit
 golang.org/x/sys/cpu
 golang.org/x/sys/unix
@@ -465,7 +463,7 @@ google.golang.org/grpc/tap
 # gopkg.in/yaml.v2 v2.2.8
 ## explicit
 gopkg.in/yaml.v2
-# storj.io/common v0.0.0-20200529121635-ef4a5bc8ec88
+# storj.io/common v0.0.0-20200611114417-9a3d012fdb62
 storj.io/common/encryption
 storj.io/common/errs2
 storj.io/common/fpath
@@ -504,15 +502,14 @@ storj.io/drpc/drpcmux
 storj.io/drpc/drpcsignal
 storj.io/drpc/drpcstream
 storj.io/drpc/drpcwire
-# storj.io/uplink v1.0.7
+# storj.io/uplink v1.1.1
 ## explicit
 storj.io/uplink
 storj.io/uplink/internal/expose
 storj.io/uplink/internal/telemetryclient
 storj.io/uplink/private/ecclient
 storj.io/uplink/private/eestream
 storj.io/uplink/private/metainfo
-storj.io/uplink/private/metainfo/kvmetainfo
 storj.io/uplink/private/piecestore
 storj.io/uplink/private/storage/segments
 storj.io/uplink/private/storage/streams