From 35fa19e47d7a5262b57972d15f91349569f1ad49 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Tue, 29 Aug 2023 20:41:01 +0200
Subject: [PATCH] Cleaning code

---
 modoboa_installer/python.py          |  7 ++++++-
 modoboa_installer/scripts/modoboa.py | 11 +----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/modoboa_installer/python.py b/modoboa_installer/python.py
index f7f00c1..9b46ccf 100644
--- a/modoboa_installer/python.py
+++ b/modoboa_installer/python.py
@@ -1,6 +1,7 @@
 """Python related tools."""
 
 import os
+import sys
 
 from . import package
 from . import utils
@@ -51,7 +52,11 @@ def get_package_version(name, venv=None, **kwargs):
         get_pip_path(venv),
         name
     )
-    status, output = utils.exec_cmd(cmd, **kwargs)
+    exit_code, output = utils.exec_cmd(cmd, **kwargs)
+    if exit_code != 0:
+        utils.error(f"Failed to get version of {name}. "
+                    f"Output is: {output}")
+        sys.exit(1)
 
     output_list = output.split("\n")
     version_item_list = output_list[1].split(":")
diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py
index 1496fb6..7e8d01c 100644
--- a/modoboa_installer/scripts/modoboa.py
+++ b/modoboa_installer/scripts/modoboa.py
@@ -228,16 +228,7 @@ class Modoboa(base.Installer):
         config_files.append(path)
 
         # Add worker for dkim if needed
-        modoboa_version = python.get_package_version(
-            "modoboa",
-            self.venv_path,
-            sudo_user=self.user
-            )
-        condition = (
-            (modoboa_version[0] == 2 and modoboa_version[1] >= 2) or
-            modoboa_version[0] > 2
-            )
-        if condition:
+        if self.modoboa_2_2_or_greater:
             config_files.append(
                 "supervisor-rq=/etc/supervisor/conf.d/modoboa-worker.conf")
         return config_files