diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-12-10 00:29:39 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-12-31 15:04:22 -0500 |
| commit | 3fd16e6261f9c19a68ba69f1d97027a6eaf3a22b (patch) | |
| tree | 02a9c77717acfe698a6c7dc4e2f1c95c9dc73aee /docs | |
| parent | a228545026e30d3223b3fbb13a262b5e005101ae (diff) | |
[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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.6.2.txt | 5 |
2 files changed, 6 insertions, 1 deletions
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. |