summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/contrib/staticfiles/management/commands/collectstatic.py3
-rw-r--r--tests/staticfiles_tests/tests.py4
2 files changed, 7 insertions, 0 deletions
diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py
index 1ed7127f96..0c3f4e15fd 100644
--- a/django/contrib/staticfiles/management/commands/collectstatic.py
+++ b/django/contrib/staticfiles/management/commands/collectstatic.py
@@ -199,6 +199,9 @@ class Command(BaseCommand):
"""
Deletes the given relative path using the destination storage backend.
"""
+ if not self.storage.exists(path):
+ return
+
dirs, files = self.storage.listdir(path)
for f in files:
fpath = os.path.join(path, f)
diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
index c65187d132..9cfabecbb2 100644
--- a/tests/staticfiles_tests/tests.py
+++ b/tests/staticfiles_tests/tests.py
@@ -301,6 +301,10 @@ class TestCollectionClear(CollectionTestCase):
def test_cleared_not_found(self):
self.assertFileNotFound('cleared.txt')
+ def test_dir_not_exists(self, **kwargs):
+ shutil.rmtree(settings.STATIC_ROOT)
+ super(TestCollectionClear, self).run_collectstatic(clear=True)
+
class TestCollectionExcludeNoDefaultIgnore(CollectionTestCase, TestDefaults):
"""