From 076bb8a2a2e666ad0ee4bc18a31f3913ff7bffb3 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Fri, 3 Sep 2021 11:48:49 +0100
Subject: [PATCH] Close storage objects before cleaning (#16934)
Storage.Iterate provides the path and an open object. On windows using
local storage means that the objects will be locked thus preventing clean
from deleting them.
This PR simply closes the objects early.
Fix #16932
Signed-off-by: Andrew Thornton <art27@cantab.net>
---
modules/storage/storage.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/storage/storage.go b/modules/storage/storage.go
index 9f87e58b60..2532ceb35d 100644
--- a/modules/storage/storage.go
+++ b/modules/storage/storage.go
@@ -91,6 +91,7 @@ func Copy(dstStorage ObjectStorage, dstPath string, srcStorage ObjectStorage, sr
// Clean delete all the objects in this storage
func Clean(storage ObjectStorage) error {
return storage.IterateObjects(func(path string, obj Object) error {
+ _ = obj.Close()
return storage.Delete(path)
})
}