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

Quick fix for Ubuntu 18.04 compat.

Browse Source 
fix #211
This commit is contained in:
Antoine Nguyen
2018-05-09 14:46:18 +02:00
parent c77e6f27f1
commit fc64cd07e0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modoboa_installer/scripts/amavis.py
View File

@@ -1,5 +1,7 @@
"""Amavis related functions.""" """Amavis related functions."""
import platform
from .. import package from .. import package
from .. import utils from .. import utils
@@ -16,7 +18,7 @@ class Amavis(base.Installer):
"deb": [ "deb": [
"libdbi-perl", "amavisd-new", "arc", "arj", "cabextract", "libdbi-perl", "amavisd-new", "arc", "arj", "cabextract",
"liblz4-tool", "lrzip", "lzop", "p7zip-full", "rpm2cpio", "liblz4-tool", "lrzip", "lzop", "p7zip-full", "rpm2cpio",
"unrar-free", "zoo", "ripole" "unrar-free", "ripole"
], ],
"rpm": [ "rpm": [
"amavisd-new", "arj", "cabextract", "lz4", "lrzip", "amavisd-new", "arj", "cabextract", "lz4", "lrzip",
@@ -50,6 +52,9 @@ class Amavis(base.Installer):
"""Additional packages.""" """Additional packages."""
packages = super(Amavis, self).get_packages() packages = super(Amavis, self).get_packages()
if package.backend.FORMAT == "deb": if package.backend.FORMAT == "deb":
if platform.linux_distribution()[2] != "bionic":
# Quick fix
packages.append("zoo")
db_driver = "pg" if self.db_driver == "pgsql" else self.db_driver db_driver = "pg" if self.db_driver == "pgsql" else self.db_driver
return packages + ["libdbd-{}-perl".format(db_driver)] return packages + ["libdbd-{}-perl".format(db_driver)]
if self.db_driver == "pgsql": if self.db_driver == "pgsql":