diff options
| -rw-r--r-- | django/contrib/staticfiles/utils.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/django/contrib/staticfiles/utils.py b/django/contrib/staticfiles/utils.py index e7598d4aa5..217bc7a706 100644 --- a/django/contrib/staticfiles/utils.py +++ b/django/contrib/staticfiles/utils.py @@ -45,3 +45,10 @@ def check_settings(): (settings.MEDIA_ROOT == settings.STATIC_ROOT)): raise ImproperlyConfigured("The MEDIA_ROOT and STATIC_ROOT " "settings must have different values") + for path in settings.STATICFILES_DIRS: + # in case the item contains a prefix + if isinstance(path, (list, tuple)): + path = path[1] + if os.path.abspath(settings.STATIC_ROOT) == os.path.abspath(path): + raise ImproperlyConfigured("The STATICFILES_DIRS setting should " + "not contain the STATIC_ROOT setting") |