Merge pull request #581 from seb4itik/master

Fix #561 and #576
modoboa · Jan 29, 2025 · 7809250 · 7809250
2 parents 5313abf + 5fbf373
commit 7809250
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modoboa_installer/database.py b/modoboa_installer/database.py
@@ -103,7 +103,7 @@ def create_user(self, name, password):
     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
@@ -101,8 +101,8 @@ def _setup_venv(self):
                     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)