diff options
| author | Robin Appelman <robin@icewind.nl> | 2021-10-15 13:30:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 13:30:51 +0000 |
| commit | fadeae8c8affac033ebbea88b80a8295ee4f6af4 (patch) | |
| tree | 6a2ac58f3e4d4fe3c9cd64b3f06a5228ab41e15d | |
| parent | 5645b2a18ad6d719e2de42760be238dc56460fbb (diff) | |
| parent | d02936bfb33b82e9b322406d9618b8e0c41ef1f0 (diff) | |
| download | nextcloud-server-fadeae8c8affac033ebbea88b80a8295ee4f6af4.tar.gz nextcloud-server-fadeae8c8affac033ebbea88b80a8295ee4f6af4.zip | |
Merge pull request #29185 from nextcloud/revert-29165-bug/noid/s3-delete-folder-versions
Revert "Delete S3 versions in rmdir"
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index a6872f1dc3e..1bdd11e39bd 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -311,35 +311,13 @@ class AmazonS3 extends \OC\Files\Storage\Common { $connection->deleteObjects([ 'Bucket' => $this->bucket, 'Delete' => [ - 'Objects' => $objects['Contents'], + 'Objects' => $objects['Contents'] ] ]); $this->testTimeout(); } // we reached the end when the list is no longer truncated } while ($objects['IsTruncated']); - - do { - // delete all contained versions and deletion markers - $objects = $connection->listObjectVersions($params); - if (isset($objects['Versions'])) { - $connection->deleteObjects([ - 'Bucket' => $this->bucket, - 'Delete' => [ - 'Objects' => $objects['Versions'], - ] - ]); - } - if (isset($objects['DeleteMarkers'])) { - $connection->deleteObjects([ - 'Bucket' => $this->bucket, - 'Delete' => [ - 'Objects' => $objects['DeleteMarkers'], - ] - ]); - } - // we reached the end when the list is no longer truncated - } while ($objects['IsTruncated']); $this->deleteObject($path); } catch (S3Exception $e) { \OC::$server->getLogger()->logException($e, ['app' => 'files_external']); |