mirror of
https://github.com/django/django.git
synced 2024-12-24 18:16:19 +00:00
Preserve order of STATICFILES_DIRS locations in FileSystemFinder.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
5cd5612808
commit
3bff7ed34c
@ -42,10 +42,10 @@ class FileSystemFinder(BaseFinder):
|
||||
to locate files.
|
||||
"""
|
||||
def __init__(self, apps=None, *args, **kwargs):
|
||||
# List of locations with static files
|
||||
self.locations = []
|
||||
# Maps dir paths to an appropriate storage instance
|
||||
self.storages = SortedDict()
|
||||
# Set of locations with static files
|
||||
self.locations = set()
|
||||
if not isinstance(settings.STATICFILES_DIRS, (list, tuple)):
|
||||
raise ImproperlyConfigured(
|
||||
"Your STATICFILES_DIRS setting is not a tuple or list; "
|
||||
@ -59,13 +59,12 @@ class FileSystemFinder(BaseFinder):
|
||||
raise ImproperlyConfigured(
|
||||
"The STATICFILES_DIRS setting should "
|
||||
"not contain the STATIC_ROOT setting")
|
||||
self.locations.add((prefix, root))
|
||||
# Don't initialize multiple storages for the same location
|
||||
if (prefix, root) not in self.locations:
|
||||
self.locations.append((prefix, root))
|
||||
for prefix, root in self.locations:
|
||||
filesystem_storage = FileSystemStorage(location=root)
|
||||
filesystem_storage.prefix = prefix
|
||||
self.storages[root] = filesystem_storage
|
||||
|
||||
super(FileSystemFinder, self).__init__(*args, **kwargs)
|
||||
|
||||
def find(self, path, all=False):
|
||||
|
Loading…
Reference in New Issue
Block a user