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

Fix wo purge

Browse Source
This commit is contained in:
VirtuBox
2019-08-16 23:51:25 +02:00
parent e98ed1fe7a
commit e6b28cad8b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wo/cli/plugins/stack.py
View File

@@ -582,7 +582,7 @@ class WOStackController(CementBaseController):
.format(WOVariables.wo_webroot)] .format(WOVariables.wo_webroot)]
if (packages) or (apt_packages): if (packages) or (apt_packages):
if ((not pargs.no_prompt) and (not pargs.force)): if not pargs.force:
wo_prompt = input('Are you sure you to want to' wo_prompt = input('Are you sure you to want to'
' remove from server.' ' remove from server.'
'\nPackage configuration will remain' '\nPackage configuration will remain'
@@ -590,7 +590,7 @@ class WOStackController(CementBaseController):
'Any answer other than ' 'Any answer other than '
'"yes" will be stop this' '"yes" will be stop this'
' operation : ') ' operation : ')
if (wo_prompt == 'YES' or wo_prompt == 'yes' or pargs.force): if (wo_prompt != 'YES' or wo_prompt != 'yes'):
Log.error(self, "Not removing packages") Log.error(self, "Not removing packages")
if (set(["nginx-custom"]).issubset(set(apt_packages))): if (set(["nginx-custom"]).issubset(set(apt_packages))):
@@ -761,14 +761,14 @@ class WOStackController(CementBaseController):
.format(WOVariables.wo_webroot)] .format(WOVariables.wo_webroot)]
if (packages) or (apt_packages): if (packages) or (apt_packages):
if ((not pargs.no_prompt) and (not pargs.force)): if not pargs.force:
wo_prompt = input('Are you sure you to want to purge ' wo_prompt = input('Are you sure you to want to purge '
'from server ' 'from server '
'along with their configuration' 'along with their configuration'
' packages,\nAny answer other than ' ' packages,\nAny answer other than '
'"yes" will be stop this ' '"yes" will be stop this '
'operation :') 'operation :')
if (wo_prompt == 'YES' or wo_prompt == 'yes' or pargs.force): if (wo_prompt != 'YES' or wo_prompt != 'yes'):
Log.error(self, "Not purging packages") Log.error(self, "Not purging packages")
if (set(["nginx-custom"]).issubset(set(apt_packages))): if (set(["nginx-custom"]).issubset(set(apt_packages))):