From a59d20bd0f32de6f04400d939a6f310e822c7a93 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaccs@googlemail.com>
Date: Sat, 20 Jul 2024 11:31:31 +0200
Subject: [PATCH] Output error message in case import of libmagic fails (#3104)

---
 cps/file_helper.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cps/file_helper.py b/cps/file_helper.py
index d6182311..9d5406d3 100644
--- a/cps/file_helper.py
+++ b/cps/file_helper.py
@@ -29,8 +29,9 @@ log = logger.create()
 
 try:
     import magic
+    error = None
 except ImportError as e:
-    log.error("Cannot import python-magic, checking uploaded file metadata will not work: %s", e)
+    error = "Cannot import python-magic, checking uploaded file metadata will not work: {}".format(e)
 
 
 def get_temp_dir():
@@ -46,6 +47,9 @@ def del_temp_dir():
 
 
 def validate_mime_type(file_buffer, allowed_extensions):
+    if error:
+        log.error(error)
+        return False
     mime = magic.Magic(mime=True)
     allowed_mimetypes = list()
     for x in allowed_extensions: