From edcbbfc5cf5ee01e7ed8157f79ab092f87438fbc Mon Sep 17 00:00:00 2001
From: Ludovic <54670129+lbr38@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:20:00 +0200
Subject: [PATCH] patch

---
 src/controllers/App/Utils.py               | 9 ++++++---
 src/controllers/Module/Reposerver/Agent.py | 2 +-
 src/controllers/Package/Apt.py             | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/controllers/App/Utils.py b/src/controllers/App/Utils.py
index a8a4721..edcbed2 100644
--- a/src/controllers/App/Utils.py
+++ b/src/controllers/App/Utils.py
@@ -26,6 +26,9 @@ def is_json(self, jsonString):
     #
     #-----------------------------------------------------------------------------------------------
     def remove_ansi(self, text):
-        ansi_escape = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]')
-
-        return ansi_escape.sub('', text)
+        try:
+            ansi_escape = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]')
+            return ansi_escape.sub('', text)
+        # If an exception occurs, simply return the original text as it is
+        except Exception as e:
+            return text
diff --git a/src/controllers/Module/Reposerver/Agent.py b/src/controllers/Module/Reposerver/Agent.py
index c2bc71e..a2380a5 100644
--- a/src/controllers/Module/Reposerver/Agent.py
+++ b/src/controllers/Module/Reposerver/Agent.py
@@ -229,7 +229,7 @@ def websocket_on_message(self, ws, message):
                                 Path(log).unlink()
                         except Exception as e:
                             # If content could not be read, then generate an error message
-                            logcontent = 'Error: could not read log file'                          
+                            logcontent = 'Error: could not read log file: ' + str(e)                        
 
                         json_response['response-to-request']['log'] = logcontent
 
diff --git a/src/controllers/Package/Apt.py b/src/controllers/Package/Apt.py
index 836f73c..aa738e8 100644
--- a/src/controllers/Package/Apt.py
+++ b/src/controllers/Package/Apt.py
@@ -254,7 +254,7 @@ def update(self, packagesList, update_method: str = 'one_by_one', exit_on_packag
                         cmd = [
                                 'apt-get', 'install', pkg['name'], '-y',
                                 # Debug only
-                                # '--dry-run',
+                                '--dry-run',
                                 '-o', 'Dpkg::Options::=--force-confdef',
                                 '-o', 'Dpkg::Options::=--force-confold'
                             ]