From 5fbf373dc2c9fe1f1472b9df4470a71e266b4046 Mon Sep 17 00:00:00 2001 From: "S. Nameche" Date: Tue, 28 Jan 2025 21:04:44 +0300 Subject: [PATCH] Fix #561 and #576 --- modoboa_installer/database.py | 2 +- modoboa_installer/scripts/modoboa.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modoboa_installer/database.py b/modoboa_installer/database.py index e2ea8b8..7f7a29f 100644 --- a/modoboa_installer/database.py +++ b/modoboa_installer/database.py @@ -103,7 +103,7 @@ class PostgreSQL(Database): def create_database(self, name, owner): """Create a database.""" code, output = utils.exec_cmd( - "psql -lqt | cut -d \| -f 1 | grep -w {} | wc -l" + "psql -lqt | cut -d \\| -f 1 | grep -w {} | wc -l" .format(name), sudo_user=self.dbuser) if code: return diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 1904a14..dde382b 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -101,8 +101,8 @@ class Modoboa(base.Installer): req_version = matrix[extension] if req_version is None: continue - req_version = req_version.replace("<", "\<") - req_version = req_version.replace(">", "\>") + req_version = req_version.replace("<", "\\<") + req_version = req_version.replace(">", "\\>") packages.append("{}{}".format(extension, req_version)) else: packages.append(extension)