From cbe0590ce583737cff98eb54332f1f1a47bb8ba9 Mon Sep 17 00:00:00 2001 From: yackob03 Date: Tue, 1 Oct 2013 14:46:44 -0400 Subject: [PATCH] Fix s3 delete. --- endpoints/api.py | 4 ++-- endpoints/registry.py | 2 +- storage/s3.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/endpoints/api.py b/endpoints/api.py index 4896116d9..ddc9bfa5e 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -11,7 +11,7 @@ from util.gravatar import compute_hash from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermission, AdministerRepositoryPermission) -from endpoints.registry import delete_registry_storage +from endpoints import registry logger = logging.getLogger(__name__) @@ -146,7 +146,7 @@ def delete_repository(namespace, repository): permission = AdministerRepositoryPermission(namespace, repository) if permission.can(): model.purge_repository(namespace, repository) - delete_registry_storage(namespace, repository) + registry.delete_repository_storage(namespace, repository) return make_response('Deleted', 204) abort(404) diff --git a/endpoints/registry.py b/endpoints/registry.py index 0fda2db78..dc9b31590 100644 --- a/endpoints/registry.py +++ b/endpoints/registry.py @@ -304,7 +304,7 @@ def put_image_json(namespace, repository, image_id): return make_response('true', 200) -def delete_registry_storage(namespace, repository): +def delete_repository_storage(namespace, repository): """ Caller should have already verified proper permissions. """ repository_path = store.repository_namespace_path(namespace, repository) diff --git a/storage/s3.py b/storage/s3.py index fb125186b..d6e4fe5d1 100644 --- a/storage/s3.py +++ b/storage/s3.py @@ -116,7 +116,7 @@ class S3Storage(Storage): # We assume it's a directory if not path.endswith('/'): path += '/' - for key in self._s3_bucket.list(prefix=path, delimiter='/'): + for key in self._s3_bucket.list(prefix=path): key.delete() def get_size(self, path):