Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(integrity check): update hash + handle collectstatic #10241

Merged
merged 4 commits into from
May 22, 2024
Merged

fix(integrity check): update hash + handle collectstatic #10241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21010b0
trigger
kiblik May 21, 2024
55d56d5
Do not check on 'collectstatic'
kiblik May 21, 2024
6fed567
test wrong hash
kiblik May 21, 2024
546f366
Revert "test wrong hash"
kiblik May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dojo/settings/.settings.dist.py.sha256sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
86a9b26bbb326e3db829374494fe1648489abe5c29233bba63a2c50178782ed3
f23b780905f138f168436a6579b45a1ccaa0deb35e6b11b1e9169f13266e4bb0
3 changes: 2 additions & 1 deletion dojo/settings/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import hashlib
import sys
from pathlib import Path

from split_settings.tools import include, optional
Expand All @@ -11,7 +12,7 @@
optional('local_settings.py')
)

if not DEBUG:
if not (DEBUG or ('collectstatic' in sys.argv)):
with (Path(__file__).parent / 'settings.dist.py').open('rb') as file:
real_hash = hashlib.sha256(file.read()).hexdigest()
with (Path(__file__).parent / '.settings.dist.py.sha256sum').open('rb') as file:
Expand Down
Loading