evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #581 from seb4itik/master

Browse Source 
Fix #561 and #576
This commit is contained in:
Antoine Nguyen
2025-01-29 09:40:58 +01:00
committed by GitHub
parent 5313abf42b 5fbf373dc2
commit 78092509c7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modoboa_installer/database.py
View File

@@ -103,7 +103,7 @@ class PostgreSQL(Database):
def create_database(self, name, owner): def create_database(self, name, owner):
"""Create a database.""" """Create a database."""
code, output = utils.exec_cmd( 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) .format(name), sudo_user=self.dbuser)
if code: if code:
return return

4
modoboa_installer/scripts/modoboa.py
View File

@@ -101,8 +101,8 @@ class Modoboa(base.Installer):
req_version = matrix[extension] req_version = matrix[extension]
if req_version is None: if req_version is None:
continue 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)) packages.append("{}{}".format(extension, req_version))
else: else:
packages.append(extension) packages.append(extension)