From b9d5a202313f84b7610a0c7a5ff3613894431ca8 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sat, 16 Mar 2019 09:18:15 +0100 Subject: [PATCH] fix php extras with php73 --- wo/cli/plugins/site.py | 2 +- wo/cli/plugins/stack.py | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index f042bb7..36f248a 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -454,7 +454,7 @@ class WOSiteCreateController(CementBaseController): # Check prompt check_prompt = input("Type \"y\" to continue [n]:") if check_prompt != "Y" and check_prompt != "y": - Log.info(self, "Not using PHP 7.2 for site.") + Log.info(self, "Not using PHP 7.3 for site.") data['php73'] = True data['basic'] = True php73 = 1 diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 6ad1a9d..459c9c2 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -1183,7 +1183,10 @@ class WOStackController(CementBaseController): if self.app.pargs.php: Log.debug(self, "Setting apt_packages variable for PHP 7.2") if not (WOAptGet.is_installed(self, 'php7.2-fpm')): - apt_packages = apt_packages + WOVariables.wo_php + WOVariables.wo_php_extra + if not (WOAptGet.is_installed(self, 'php7.3-fpm')): + apt_packages = apt_packages + WOVariables.wo_php + WOVariables.wo_php_extra + else: + apt_packages = apt_packages + WOVariables.wo_php else: Log.debug(self, "PHP 7.2 already installed") Log.info(self, "PHP 7.2 already installed") @@ -1192,7 +1195,10 @@ class WOStackController(CementBaseController): if self.app.pargs.php73: Log.debug(self, "Setting apt_packages variable for PHP 7.3") if not WOAptGet.is_installed(self, 'php7.3-fpm'): - apt_packages = apt_packages + WOVariables.wo_php73 + if not (WOAptGet.is_installed(self, 'php7.2-fpm')): + apt_packages = apt_packages + WOVariables.wo_php73 + WOVariables.wo_php_extra + else: + apt_packages = apt_packages + WOVariables.wo_php73 else: Log.debug(self, "PHP 7.3 already installed") Log.info(self, "PHP 7.3 already installed") @@ -1398,7 +1404,10 @@ class WOStackController(CementBaseController): if self.app.pargs.php73: Log.debug(self, "Removing apt_packages variable of PHP 7.3") if not WOAptGet.is_installed(self, 'php7.3-fpm'): - apt_packages = apt_packages + WOVariables.wo_php73 + if not (WOAptGet.is_installed(self, 'php7.2-fpm')): + apt_packages = apt_packages + WOVariables.wo_php73 + WOVariables.wo_php_extra + else: + apt_packages = apt_packages + WOVariables.wo_php73 # REDIS if self.app.pargs.redis: @@ -1534,7 +1543,10 @@ class WOStackController(CementBaseController): if self.app.pargs.php73: Log.debug(self, "Removing apt_packages variable of PHP 7.3") if not WOAptGet.is_installed(self, 'php7.3-fpm'): - apt_packages = apt_packages + WOVariables.wo_php73 + if not (WOAptGet.is_installed(self, 'php7.2-fpm')): + apt_packages = apt_packages + WOVariables.wo_php73 + WOVariables.wo_php_extra + else: + apt_packages = apt_packages + WOVariables.wo_php73 else: Log.error(self, "Cannot Purge PHP 7.3. not found.") # WP-CLI