From ef1bace29eb4a5ff6020deac3865c8b382e06834 Mon Sep 17 00:00:00 2001 From: Spitap Date: Tue, 29 Aug 2023 20:42:44 +0200 Subject: [PATCH] Cleaning code the 2nd --- modoboa_installer/scripts/dovecot.py | 6 ++++++ modoboa_installer/scripts/modoboa.py | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py index 3224de3..a5ba5c3 100644 --- a/modoboa_installer/scripts/dovecot.py +++ b/modoboa_installer/scripts/dovecot.py @@ -7,6 +7,7 @@ import shutil from .. import database from .. import package +from .. import python from .. import system from .. import utils @@ -33,6 +34,11 @@ class Dovecot(base.Installer): def __init__(self, *args, **kwargs): super.__init__(*args, **kwargs) # Check if modoboa version > 2.2 + modoboa_version = python.get_package_version( + "modoboa", + self.venv_path, + sudo_user=self.user + ) self.modoboa_2_2_or_greater = False condition = ( (modoboa_version[0] == 2 and modoboa_version[1] >= 2) or diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 7e8d01c..2414eb5 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -46,6 +46,11 @@ class Modoboa(base.Installer): """Get configuration.""" super(Modoboa, self).__init__(*args, **kwargs) # Check if modoboa version > 2.2 + modoboa_version = python.get_package_version( + "modoboa", + self.venv_path, + sudo_user=self.user + ) self.modoboa_2_2_or_greater = False condition = ( (modoboa_version[0] == 2 and modoboa_version[1] >= 2) or