Commit 6ee96888 by Tom 'Biwaa' Riat Committed by GitHub

Merge pull request #562 from etiago/linux_paths_on_windows

Fixes using forward-slashed paths on Windows
parents 4d501b57 03aebf48
...@@ -4,6 +4,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage ...@@ -4,6 +4,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage
from django.contrib.staticfiles.finders import BaseFinder, BaseStorageFinder, find, \ from django.contrib.staticfiles.finders import BaseFinder, BaseStorageFinder, find, \
AppDirectoriesFinder as DjangoAppDirectoriesFinder, FileSystemFinder as DjangoFileSystemFinder AppDirectoriesFinder as DjangoAppDirectoriesFinder, FileSystemFinder as DjangoFileSystemFinder
from django.utils._os import safe_join from django.utils._os import safe_join
from os.path import normpath
from pipeline.conf import settings from pipeline.conf import settings
...@@ -28,7 +29,7 @@ class ManifestFinder(BaseFinder): ...@@ -28,7 +29,7 @@ class ManifestFinder(BaseFinder):
""" """
matches = [] matches = []
for elem in chain(settings.STYLESHEETS.values(), settings.JAVASCRIPT.values()): for elem in chain(settings.STYLESHEETS.values(), settings.JAVASCRIPT.values()):
if elem['output_filename'] == path: if normpath(elem['output_filename']) == normpath(path):
match = safe_join(settings.PIPELINE_ROOT, path) match = safe_join(settings.PIPELINE_ROOT, path)
if not all: if not all:
return match return match
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment