p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Jannis Leidel 2011-07-06 10:28:18 +00:00
parent 901ea8a68d
commit 21e0b3a243
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/staticfiles/management/commands/collectstatic.py
View File

@ -107,8 +107,10 @@ Type 'yes' to continue, or 'no' to cancel: """
for path, storage in finder.list(self.ignore_patterns): for path, storage in finder.list(self.ignore_patterns):
# Prefix the relative path if the source storage contains it # Prefix the relative path if the source storage contains it
if getattr(storage, 'prefix', None): if getattr(storage, 'prefix', None):
path = os.path.join(storage.prefix, path) prefixed_path = os.path.join(storage.prefix, path)
handler(path, path, storage) else:
prefixed_path = path
handler(path, prefixed_path, storage)
actual_count = len(self.copied_files) + len(self.symlinked_files) actual_count = len(self.copied_files) + len(self.symlinked_files)
unmodified_count = len(self.unmodified_files) unmodified_count = len(self.unmodified_files)

1
tests/regressiontests/staticfiles_tests/project/prefixed/test.txt Normal file
View File

@ -0,0 +1 @@
Prefix!

6
tests/regressiontests/staticfiles_tests/tests.py
View File

@ -54,7 +54,10 @@ StaticFilesTestCase = override_settings(
STATIC_URL = '/static/', STATIC_URL = '/static/',
MEDIA_ROOT = os.path.join(TEST_ROOT, 'project', 'site_media', 'media'), MEDIA_ROOT = os.path.join(TEST_ROOT, 'project', 'site_media', 'media'),
STATIC_ROOT = os.path.join(TEST_ROOT, 'project', 'site_media', 'static'), 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 = ( STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
@ -105,6 +108,7 @@ class TestDefaults(object):
Can find a file in a STATICFILES_DIRS directory. Can find a file in a STATICFILES_DIRS directory.
""" """
self.assertFileContains('test.txt', 'Can we find') self.assertFileContains('test.txt', 'Can we find')
self.assertFileContains(os.path.join('prefix', 'test.txt'), 'Prefix')
def test_staticfiles_dirs_subdir(self): def test_staticfiles_dirs_subdir(self):
""" """