innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[3.0.x] Fixed #30802 -- Prevented manifest creation when running collectstatic in dry run mode. 

Backport of fa8fe09e4e from master
This commit is contained in:
pablo 2019-09-26 12:05:32 -07:00 committed by Mariusz Felisiak
parent 0c655f1df2
commit 5d63bf0bc3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/staticfiles/storage.py
View File

@ -403,7 +403,8 @@ class ManifestFilesMixin(HashedFilesMixin):
def post_process(self, *args, **kwargs): def post_process(self, *args, **kwargs):
self.hashed_files = {} self.hashed_files = {}
yield from super().post_process(*args, **kwargs) yield from super().post_process(*args, **kwargs)
self.save_manifest() if not kwargs.get('dry_run'):
self.save_manifest()
def save_manifest(self): def save_manifest(self):
payload = {'paths': self.hashed_files, 'version': self.manifest_version} payload = {'paths': self.hashed_files, 'version': self.manifest_version}

5
tests/staticfiles_tests/test_management.py
View File

@ -334,6 +334,11 @@ class TestCollectionDryRun(TestNoFilesCreated, CollectionTestCase):
super().run_collectstatic(dry_run=True) super().run_collectstatic(dry_run=True)
@override_settings(STATICFILES_STORAGE='django.contrib.staticfiles.storage.ManifestStaticFilesStorage')
class TestCollectionDryRunManifestStaticFilesStorage(TestCollectionDryRun):
pass
class TestCollectionFilesOverride(CollectionTestCase): class TestCollectionFilesOverride(CollectionTestCase):
""" """
Test overriding duplicated files by ``collectstatic`` management command. Test overriding duplicated files by ``collectstatic`` management command.