security-and-privacy/mat2
security-and-privacy/mat2
1
0
Fork 0
mirror of synced 2024-06-14 10:09:51 +02:00
Code Releases Activity

Minor refactorisation of how we're checking for exiftool's presence

Browse Source
This commit is contained in:
jvoisin 2018-10-25 11:05:06 +02:00
parent 5a08f5b7bf
commit 5a9dc388ad
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libmat2/exiftool.py
View File

@ -53,15 +53,14 @@ class ExiftoolParser(abstract.AbstractParser):
return True return True
def _get_exiftool_path() -> str: # pragma: no cover def _get_exiftool_path() -> str: # pragma: no cover
exiftool_path = '/usr/bin/exiftool' possible_pathes = {
if os.path.isfile(exiftool_path): '/usr/bin/exiftool', # debian/fedora
if os.access(exiftool_path, os.X_OK): '/usr/bin/vendor_perl/exiftool', # archlinux
return exiftool_path }
# ArchLinux for possible_path in possible_pathes:
exiftool_path = '/usr/bin/vendor_perl/exiftool' if os.path.isfile(possible_path):
if os.path.isfile(exiftool_path): if os.access(possible_path, os.X_OK):
if os.access(exiftool_path, os.X_OK): return possible_path
return exiftool_path
raise RuntimeError("Unable to find exiftool") raise RuntimeError("Unable to find exiftool")