p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #27108 -- Displayed collectstatic's delete/overwrite warnings only if some files exist in STATIC_ROOT.

This commit is contained in:
François Freitag 2016-08-26 17:54:06 -07:00 committed by Tim Graham
parent f02dbbe1ae
commit 8c054ed71d
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
django/contrib/staticfiles/management/commands/collectstatic.py
View File

@ -173,22 +173,28 @@ class Command(BaseCommand):
if self.is_local_storage() and self.storage.location: if self.is_local_storage() and self.storage.location:
destination_path = self.storage.location destination_path = self.storage.location
message.append(':\n\n %s\n\n' % destination_path) message.append(':\n\n %s\n\n' % destination_path)
should_warn_user = (
self.storage.exists(destination_path) and
any(self.storage.listdir(destination_path))
)
else: else:
destination_path = None destination_path = None
message.append('.\n\n') message.append('.\n\n')
# Destination files existence not checked; play it safe and warn.
should_warn_user = True
if self.clear: if self.interactive and should_warn_user:
message.append('This will DELETE ALL FILES in this location!\n') if self.clear:
else: message.append('This will DELETE ALL FILES in this location!\n')
message.append('This will overwrite existing files!\n') else:
message.append('This will overwrite existing files!\n')
message.append( message.append(
'Are you sure you want to do this?\n\n' 'Are you sure you want to do this?\n\n'
"Type 'yes' to continue, or 'no' to cancel: " "Type 'yes' to continue, or 'no' to cancel: "
) )
if input(''.join(message)) != 'yes':
if self.interactive and input(''.join(message)) != 'yes': raise CommandError("Collecting static files cancelled.")
raise CommandError("Collecting static files cancelled.")
collected = self.collect() collected = self.collect()
modified_count = len(collected['modified']) modified_count = len(collected['modified'])

21
tests/staticfiles_tests/test_management.py
View File

@ -179,6 +179,7 @@ class TestCollectionClear(CollectionTestCase):
class TestInteractiveMessages(CollectionTestCase): class TestInteractiveMessages(CollectionTestCase):
overwrite_warning_msg = "This will overwrite existing files!" overwrite_warning_msg = "This will overwrite existing files!"
delete_warning_msg = "This will DELETE ALL FILES in this location!" delete_warning_msg = "This will DELETE ALL FILES in this location!"
files_copied_msg = "static files copied"
@staticmethod @staticmethod
def mock_input(stdout): def mock_input(stdout):
@ -209,6 +210,26 @@ class TestInteractiveMessages(CollectionTestCase):
self.assertIn(self.overwrite_warning_msg, output) self.assertIn(self.overwrite_warning_msg, output)
self.assertNotIn(self.delete_warning_msg, output) self.assertNotIn(self.delete_warning_msg, output)
def test_no_warning_when_staticdir_does_not_exist(self):
stdout = six.StringIO()
shutil.rmtree(six.text_type(settings.STATIC_ROOT))
call_command('collectstatic', interactive=True, stdout=stdout)
output = force_text(stdout.getvalue())
self.assertNotIn(self.overwrite_warning_msg, output)
self.assertNotIn(self.delete_warning_msg, output)
self.assertIn(self.files_copied_msg, output)
def test_no_warning_for_empty_staticdir(self):
stdout = six.StringIO()
static_dir = tempfile.mkdtemp(prefix='collectstatic_empty_staticdir_test')
with override_settings(STATIC_ROOT=static_dir):
call_command('collectstatic', interactive=True, stdout=stdout)
shutil.rmtree(six.text_type(static_dir))
output = force_text(stdout.getvalue())
self.assertNotIn(self.overwrite_warning_msg, output)
self.assertNotIn(self.delete_warning_msg, output)
self.assertIn(self.files_copied_msg, output)
class TestCollectionExcludeNoDefaultIgnore(TestDefaults, CollectionTestCase): class TestCollectionExcludeNoDefaultIgnore(TestDefaults, CollectionTestCase):
""" """