1
0
mirror of https://github.com/django/django.git synced 2025-10-26 15:16:09 +00:00

[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
This commit is contained in:
Loic Bistuer
2013-12-10 00:29:39 +07:00
committed by Tim Graham
parent a228545026
commit 3fd16e6261
6 changed files with 45 additions and 26 deletions

View File

@@ -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.

View File

@@ -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.