From 3fd16e6261f9c19a68ba69f1d97027a6eaf3a22b Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Tue, 10 Dec 2013 00:29:39 +0700 Subject: [1.6.x] Fixed #21581 -- Fixed a number of issues with collectstatic. When STATIC_ROOT wasn't set, collectstatic --clear would delete every files within the current directory and its descendants. This patch makes the following changes: Prevent collectstatic from running if STATIC_ROOT isn't set. Fixed an issue that prevented collectstatic from displaying the destination directory. Changed the warning header to notify when the command is run in dry-run mode. Backport of 4befb3015c from master --- docs/ref/settings.txt | 2 +- docs/releases/1.6.2.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 26258eaf6b..95104afacf 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2516,7 +2516,7 @@ Settings for :mod:`django.contrib.staticfiles`. STATIC_ROOT ----------- -Default: ``''`` (Empty string) +Default: ``None`` The absolute path to the directory where :djadmin:`collectstatic` will collect static files for deployment. diff --git a/docs/releases/1.6.2.txt b/docs/releases/1.6.2.txt index 41bc86e906..6043d21815 100644 --- a/docs/releases/1.6.2.txt +++ b/docs/releases/1.6.2.txt @@ -14,3 +14,8 @@ Bug fixes * Fixed a crash when executing the :djadmin:`changepassword` command when the user object representation contained non-ASCII characters (#21627). + +* The :djadmin:`collectstatic` command will raise an error rather than + default to using the current working directory if :setting:`STATIC_ROOT` is + not set. Combined with the ``--clear`` option, the previous behavior could + wipe anything below the current working directory. -- cgit v1.3