mirror of https://github.com/django/django.git
Modified collectstatic management command to not include STATIC_ROOT in the user prompt since it's misleading when using a non-local storage backend.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
6ffe1d1e1f
commit
f05aab1a43
|
@ -67,12 +67,12 @@ class Command(NoArgsCommand):
|
||||||
if options.get('interactive'):
|
if options.get('interactive'):
|
||||||
confirm = raw_input(u"""
|
confirm = raw_input(u"""
|
||||||
You have requested to collect static files at the destination
|
You have requested to collect static files at the destination
|
||||||
location as specified in your settings file ('%s').
|
location as specified in your settings file.
|
||||||
|
|
||||||
This will overwrite existing files.
|
This will overwrite existing files.
|
||||||
Are you sure you want to do this?
|
Are you sure you want to do this?
|
||||||
|
|
||||||
Type 'yes' to continue, or 'no' to cancel: """ % settings.STATIC_ROOT)
|
Type 'yes' to continue, or 'no' to cancel: """)
|
||||||
if confirm != 'yes':
|
if confirm != 'yes':
|
||||||
raise CommandError("Collecting static files cancelled.")
|
raise CommandError("Collecting static files cancelled.")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue