From 0f5fd0a349ff91a720fa8a2ea33c3cb7f187b518 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 4 May 2020 19:33:10 +0200 Subject: [PATCH] Fix php-memcached on Ubuntu 20.04 --- wo/core/variables.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/wo/core/variables.py b/wo/core/variables.py index 3840790..50b18f8 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -140,18 +140,22 @@ class WOVar(): "zip", "xml", "soap"] wo_php72 = [] for module in wo_module: - wo_php72 = wo_php72 + ["php7.2-{0}".format(module), - "php7.2-recode"] + wo_php72 = wo_php72 + ["php7.2-{0}".format(module)] + wo_php72 = wo_php72 + ["php7.2-recode"] wo_php73 = [] for module in wo_module: - wo_php73 = wo_php73 + ["php7.3-{0}".format(module), - "php7.3-recode"] + wo_php73 = wo_php73 + ["php7.3-{0}".format(module)] + wo_php73 = wo_php73 + ["php7.3-recode"] wo_php74 = [] for module in wo_module: wo_php74 = wo_php74 + ["php7.4-{0}".format(module)] - wo_php_extra = ["php-memcached", "php-imagick", "php-igbinary", - "graphviz", "php-xdebug", "php-msgpack", "php-redis"] + if not wo_platform_codename == 'focal': + wo_php_extra = ["php-memcached", "php-imagick", "php-igbinary", + "graphviz", "php-xdebug", "php-msgpack", "php-redis"] + else: + wo_php_extra = ["php-imagick", "php-igbinary", + "graphviz", "php-xdebug", "php-msgpack", "php-redis"] wo_mysql = ["mariadb-server", "percona-toolkit"] if wo_distro == 'raspbian':