From f05aab1a437b7f133c8152eef5987fc8cfe5403b Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 9 Mar 2011 12:34:17 +0000 Subject: [PATCH] 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 --- .../contrib/staticfiles/management/commands/collectstatic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py index 563a6ac161..24b29e4556 100644 --- a/django/contrib/staticfiles/management/commands/collectstatic.py +++ b/django/contrib/staticfiles/management/commands/collectstatic.py @@ -67,12 +67,12 @@ class Command(NoArgsCommand): if options.get('interactive'): confirm = raw_input(u""" 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. 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': raise CommandError("Collecting static files cancelled.")