github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-29 03:48:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

azureblob: fix purging with directory markers

Browse Source
This commit is contained in:
Nick Craig-Wood 2023-09-05 17:07:44 +01:00
parent c58d4fe939
commit bd23ea028e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/azureblob/azureblob.go
View File

@ -1486,7 +1486,7 @@ func (f *Fs) deleteContainer(ctx context.Context, containerName string) error {
func (f *Fs) Rmdir(ctx context.Context, dir string) error { func (f *Fs) Rmdir(ctx context.Context, dir string) error {
container, directory := f.split(dir) container, directory := f.split(dir)
// Remove directory marker file // Remove directory marker file
if f.opt.DirectoryMarkers && container != "" && dir != "" { if f.opt.DirectoryMarkers && container != "" && directory != "" {
o := &Object{ o := &Object{
fs: f, fs: f,
remote: dir + "/", remote: dir + "/",
@ -1520,7 +1520,10 @@ func (f *Fs) Hashes() hash.Set {
// Purge deletes all the files and directories including the old versions. // Purge deletes all the files and directories including the old versions.
func (f *Fs) Purge(ctx context.Context, dir string) error { func (f *Fs) Purge(ctx context.Context, dir string) error {
container, directory := f.split(dir) container, directory := f.split(dir)
if container == "" || directory != "" { if container == "" {
return errors.New("can't purge from root")
}
if directory != "" {
// Delegate to caller if not root of a container // Delegate to caller if not root of a container
return fs.ErrorCantPurge return fs.ErrorCantPurge
} }