Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Nginx package pre_pref

Browse Source
This commit is contained in:
VirtuBox
2019-08-22 15:04:19 +02:00
parent 3dab982954
commit 086da5202b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wo/cli/plugins/stack_upgrade.py
View File

@@ -62,6 +62,7 @@ class WOStackUpgradeController(CementBaseController):
# All package update # All package update
apt_packages = [] apt_packages = []
packages = [] packages = []
nginx_packages = []
empty_packages = [] empty_packages = []
pargs = pargs = self.app.pargs pargs = pargs = self.app.pargs
@@ -89,6 +90,7 @@ class WOStackUpgradeController(CementBaseController):
if pargs.nginx: if pargs.nginx:
if WOAptGet.is_installed(self, 'nginx-custom'): if WOAptGet.is_installed(self, 'nginx-custom'):
apt_packages = apt_packages + WOVariables.wo_nginx apt_packages = apt_packages + WOVariables.wo_nginx
nginx_packages = nginx_packages + WOVariables.wo_nginx
else: else:
Log.info(self, "Nginx Stable is not already installed") Log.info(self, "Nginx Stable is not already installed")
@@ -182,8 +184,7 @@ class WOStackUpgradeController(CementBaseController):
Log.error(self, "Not starting package update") Log.error(self, "Not starting package update")
Log.info(self, "Updating APT packages, please wait...") Log.info(self, "Updating APT packages, please wait...")
if set(WOVariables.wo_nginx).issubset(set(apt_packages)): if set(WOVariables.wo_nginx).issubset(set(apt_packages)):
pre_pref(self, ['nginx-custom', 'nginx-wo'], pre_pref(self, nginx_packages, empty_packages)
empty_packages)
# apt-get update # apt-get update
WOAptGet.update(self) WOAptGet.update(self)
if set(WOVariables.wo_php).issubset(set(apt_packages)): if set(WOVariables.wo_php).issubset(set(apt_packages)):