TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

swift, s3, googlecloudstorage: Don't delete the container/bucket if fs wasn't at root - fixes #172

Browse source
This commit is contained in:
Nick Craig-Wood 2015-11-07 15:31:04 +00:00
parent 5df04cb763
commit a795d93bc3
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
googlecloudstorage/googlecloudstorage.go
View file

@ -407,11 +407,14 @@ func (f *Fs) Mkdir() error {
return err return err
} }
// Rmdir deletes the bucket // Rmdir deletes the bucket if the fs is at the root
// //
// Returns an error if it isn't empty: Error 409: The bucket you tried // Returns an error if it isn't empty: Error 409: The bucket you tried
// to delete was not empty. // to delete was not empty.
func (f *Fs) Rmdir() error { func (f *Fs) Rmdir() error {
if f.root != "" {
return nil
}
return f.svc.Buckets.Delete(f.bucket).Do() return f.svc.Buckets.Delete(f.bucket).Do()
} }

5
s3/s3.go
View file

@ -487,10 +487,13 @@ func (f *Fs) Mkdir() error {
return err return err
} }
// Rmdir deletes the bucket // Rmdir deletes the bucket if the fs is at the root
// //
// Returns an error if it isn't empty // Returns an error if it isn't empty
func (f *Fs) Rmdir() error { func (f *Fs) Rmdir() error {
if f.root != "" {
return nil
}
req := s3.DeleteBucketInput{ req := s3.DeleteBucketInput{
Bucket: &f.bucket, Bucket: &f.bucket,
} }

5
swift/swift.go
View file

@ -371,10 +371,13 @@ func (f *Fs) Mkdir() error {
return f.c.ContainerCreate(f.container, nil) return f.c.ContainerCreate(f.container, nil)
} }
// Rmdir deletes the container // Rmdir deletes the container if the fs is at the root
// //
// Returns an error if it isn't empty // Returns an error if it isn't empty
func (f *Fs) Rmdir() error { func (f *Fs) Rmdir() error {
if f.root != "" {
return nil
}
return f.c.ContainerDelete(f.container) return f.c.ContainerDelete(f.container)
} }