summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-03-09 12:34:17 +0000
committerJannis Leidel <jannis@leidel.info>2011-03-09 12:34:17 +0000
commitf05aab1a437b7f133c8152eef5987fc8cfe5403b (patch)
treeea568c51ac639ed30effc18eee9fcbb84819c424
parent6ffe1d1e1f881f7c952b7a022841d1c591f5771d (diff)
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
-rw-r--r--django/contrib/staticfiles/management/commands/collectstatic.py4
1 files 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.")