Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #16424 -- Fixed regression in collect static management command…

… introduced in r16509 that prevented prefixed collection.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 21e0b3a243791deef803dddcb9e15d0a3b59af96 1 parent 901ea8a
@jezdez jezdez authored
View
6 django/contrib/staticfiles/management/commands/collectstatic.py
@@ -107,8 +107,10 @@ def handle_noargs(self, **options):
for path, storage in finder.list(self.ignore_patterns):
# Prefix the relative path if the source storage contains it
if getattr(storage, 'prefix', None):
- path = os.path.join(storage.prefix, path)
- handler(path, path, storage)
+ prefixed_path = os.path.join(storage.prefix, path)
+ else:
+ prefixed_path = path
+ handler(path, prefixed_path, storage)
actual_count = len(self.copied_files) + len(self.symlinked_files)
unmodified_count = len(self.unmodified_files)
View
1  tests/regressiontests/staticfiles_tests/project/prefixed/test.txt
@@ -0,0 +1 @@
+Prefix!
View
6 tests/regressiontests/staticfiles_tests/tests.py
@@ -54,7 +54,10 @@ def assertFileNotFound(self, filepath):
STATIC_URL = '/static/',
MEDIA_ROOT = os.path.join(TEST_ROOT, 'project', 'site_media', 'media'),
STATIC_ROOT = os.path.join(TEST_ROOT, 'project', 'site_media', 'static'),
- STATICFILES_DIRS = (os.path.join(TEST_ROOT, 'project', 'documents'),),
+ STATICFILES_DIRS = (
+ os.path.join(TEST_ROOT, 'project', 'documents'),
+ ('prefix', os.path.join(TEST_ROOT, 'project', 'prefixed')),
+ ),
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
@@ -105,6 +108,7 @@ def test_staticfiles_dirs(self):
Can find a file in a STATICFILES_DIRS directory.
"""
self.assertFileContains('test.txt', 'Can we find')
+ self.assertFileContains(os.path.join('prefix', 'test.txt'), 'Prefix')
def test_staticfiles_dirs_subdir(self):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.