              if os.path.abspath(settings.STATIC_ROOT) == os.path.abspath(root):
                  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
          for prefix, root in self.locations:
              filesystem_storage = FileSystemStorage(location=root)
              filesystem_storage.prefix = prefix
              self.storages[root] = filesystem_storage
  
 
</s> remove         # Set of locations with static files
        self.locations = set()
 </s> add 
            if (prefix, root) not in self.locations:
                self.locations.append((prefix, root))
              if os.path.abspath(settings.STATIC_ROOT) == os.path.abspath(root):
                  raise ImproperlyConfigured(
                      "The STATICFILES_DIRS setting should "
                      "not contain the STATIC_ROOT setting")
            if (prefix, root) not in self.locations:
                self.locations.append((prefix, root))
            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
  
keep keep keep keep replace replace keep keep keep keep keep
 Preserve order of STATICFILES_DIRS locations in FileSystemFinder.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15389 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/contrib/staticfiles/finders.py