From ffd2e15eb0bda07d63a4a1a851c05f8e0e1f9bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Thu, 4 Feb 2021 14:00:36 +0100 Subject: [PATCH] Apply trash purge fix from the ocis driver See https://github.com/cs3org/reva/pull/1429 --- pkg/storage/utils/decomposedfs/tree/tree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/storage/utils/decomposedfs/tree/tree.go b/pkg/storage/utils/decomposedfs/tree/tree.go index f9e3294121a..39bc6a514f9 100644 --- a/pkg/storage/utils/decomposedfs/tree/tree.go +++ b/pkg/storage/utils/decomposedfs/tree/tree.go @@ -393,7 +393,7 @@ func (t *Tree) PurgeRecycleItemFunc(ctx context.Context, key string) (*node.Node } fn := func() error { - if err := os.Remove(deletedNodePath); err != nil { + if err := os.RemoveAll(deletedNodePath); err != nil { log.Error().Err(err).Str("deletedNodePath", deletedNodePath).Msg("error deleting trash node") return err }