Merge pull request #479 from YunoHost/fix-regenconf-hash-for-nonexistent-file

Return None directly if we try to calculate the hash of a file that does not exists
This commit is contained in:
Bram 2018-05-21 01:23:59 +02:00 committed by GitHub
commit d181abb3ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -713,6 +713,10 @@ def _get_files_diff(orig_file, new_file, as_string=False, skip_header=True):
def _calculate_hash(path):
"""Calculate the MD5 hash of a file"""
if not os.path.exists(path):
return None
hasher = hashlib.md5()
try:
@ -889,7 +893,7 @@ def _get_journalctl_logs(service):
import traceback
return "error while get services logs from journalctl:\n%s" % traceback.format_exc()
def manually_modified_files_compared_to_debian_default():
# from https://serverfault.com/a/90401