mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-05-17 18:51:50 +02:00
FIXUP: Handle diffoci updates appropriately
This commit is contained in:
parent
2b71e615a8
commit
685cf431a3
1 changed files with 8 additions and 3 deletions
|
@ -47,8 +47,13 @@ def diffoci_hash_matches(diffoci):
|
||||||
return diffoci_checksum == DIFFOCI_CHECKSUM
|
return diffoci_checksum == DIFFOCI_CHECKSUM
|
||||||
|
|
||||||
|
|
||||||
def diffoci_exists():
|
def diffoci_is_installed():
|
||||||
"""Check if the diffoci helper exists, and if the hash matches."""
|
"""Determine if diffoci has been installed.
|
||||||
|
|
||||||
|
Determine if diffoci has been installed, by checking if the binary exists, and if
|
||||||
|
its hash is the expected one. If the binary exists but the hash is different, then
|
||||||
|
this is a sign that we need to update the local diffoci binary.
|
||||||
|
"""
|
||||||
if not DIFFOCI_PATH.exists():
|
if not DIFFOCI_PATH.exists():
|
||||||
return False
|
return False
|
||||||
return diffoci_hash_matches(DIFFOCI_PATH.open().read())
|
return diffoci_hash_matches(DIFFOCI_PATH.open().read())
|
||||||
|
@ -134,7 +139,7 @@ def main():
|
||||||
commit = git_commit_get()
|
commit = git_commit_get()
|
||||||
git_verify(commit, args.source)
|
git_verify(commit, args.source)
|
||||||
|
|
||||||
if diffoci_exists():
|
if not diffoci_is_installed():
|
||||||
logger.info(f"Downloading diffoci helper from {DIFFOCI_URL}")
|
logger.info(f"Downloading diffoci helper from {DIFFOCI_URL}")
|
||||||
diffoci_download()
|
diffoci_download()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue