mirror of https://github.com/django/django.git
Fixed #23717 -- Fixed makemessages crash when STATIC_ROOT=None
This commit is contained in:
parent
d4bc0bf435
commit
528c9af543
|
@ -372,7 +372,7 @@ class Command(BaseCommand):
|
|||
norm_patterns.append(p)
|
||||
|
||||
all_files = []
|
||||
ignored_roots = [os.path.normpath(p) for p in (settings.MEDIA_ROOT, settings.STATIC_ROOT)]
|
||||
ignored_roots = [os.path.normpath(p) for p in (settings.MEDIA_ROOT, settings.STATIC_ROOT) if p]
|
||||
for dirpath, dirnames, filenames in os.walk(root, topdown=True, followlinks=self.symlinks):
|
||||
for dirname in dirnames[:]:
|
||||
if (is_ignored(os.path.normpath(os.path.join(dirpath, dirname)), norm_patterns) or
|
||||
|
|
|
@ -21,3 +21,6 @@ Bugfixes
|
|||
|
||||
* Prevented :djadmin:`flush` from loading initial data for migrated apps
|
||||
(:ticket:`23699`).
|
||||
|
||||
* Fixed a :djadmin:`makemessages` regression in 1.7.1 when
|
||||
:setting:`STATIC_ROOT` has the default ``None`` value (:ticket:`23717`).
|
||||
|
|
|
@ -376,6 +376,14 @@ class JavascriptExtractorTests(ExtractorTests):
|
|||
self.assertMsgId("Static content inside app should be included.", po_contents)
|
||||
self.assertNotMsgId("Content from STATIC_ROOT should not be included", po_contents)
|
||||
|
||||
@override_settings(STATIC_ROOT=None, MEDIA_ROOT='')
|
||||
def test_default_root_settings(self):
|
||||
"""
|
||||
Regression test for #23717.
|
||||
"""
|
||||
_, po_contents = self._run_makemessages(domain='djangojs')
|
||||
self.assertMsgId("Static content inside app should be included.", po_contents)
|
||||
|
||||
|
||||
class IgnoredExtractorTests(ExtractorTests):
|
||||
|
||||
|
|
Loading…
Reference in New Issue