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

Fix stack purge non interactive

Browse Source
This commit is contained in:
VirtuBox
2019-08-29 23:45:36 +02:00
parent 80ebc9d23d
commit 574406631c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -680,7 +680,7 @@ class WOStackController(CementBaseController):
'Remove stacks [y/N]?') 'Remove stacks [y/N]?')
if start_remove != "Y" and start_remove != "y": if start_remove != "Y" and start_remove != "y":
Log.error(self, "Not starting stack removal") Log.error(self, "Not starting stack removal")
Log.info(self, "Removing stacks, please wait...")
if (set(["nginx-custom"]).issubset(set(apt_packages))): if (set(["nginx-custom"]).issubset(set(apt_packages))):
WOService.stop_service(self, 'nginx') WOService.stop_service(self, 'nginx')
@@ -892,7 +892,6 @@ class WOStackController(CementBaseController):
'Purge stacks [y/N]') 'Purge stacks [y/N]')
if start_purge != "Y" and start_purge != "y": if start_purge != "Y" and start_purge != "y":
Log.error(self, "Not starting stack purge") Log.error(self, "Not starting stack purge")
Log.info(self, "Purging stacks, please wait...")
if (set(["nginx-custom"]).issubset(set(apt_packages))): if (set(["nginx-custom"]).issubset(set(apt_packages))):
WOService.stop_service(self, 'nginx') WOService.stop_service(self, 'nginx')
@@ -913,11 +912,12 @@ class WOStackController(CementBaseController):
"uninstaller.sh -y -f") "uninstaller.sh -y -f")
if (apt_packages): if (apt_packages):
Log.info(self, "Purging packages, please wait...") Log.info(self, "Purging apt packages, please wait...")
WOAptGet.remove(self, apt_packages, purge=True) WOAptGet.remove(self, apt_packages, purge=True)
WOAptGet.auto_remove(self) WOAptGet.auto_remove(self)
if (packages): if (packages):
Log.info(self, "Purging packages, please wait...")
WOFileUtils.remove(self, packages) WOFileUtils.remove(self, packages)
WOAptGet.auto_remove(self) WOAptGet.auto_remove(self)

10
wo/core/aptget.py
View File

@@ -148,14 +148,16 @@ class WOAptGet():
try: try:
with open('/var/log/wo/wordops.log', 'a') as f: with open('/var/log/wo/wordops.log', 'a') as f:
if purge: if purge:
proc = subprocess.Popen('apt-get autoremove --purge ' proc = subprocess.Popen('DEBIAN_FRONTEND=noninteractive '
'--assume-yes {0}' 'apt-get autoremove --purge '
'-qq {0}'
.format(all_packages), shell=True, .format(all_packages), shell=True,
stdin=None, stdout=f, stderr=f, stdin=None, stdout=f, stderr=f,
executable="/bin/bash") executable="/bin/bash")
else: else:
proc = subprocess.Popen('apt-get autoremove ' proc = subprocess.Popen('DEBIAN_FRONTEND=noninteractive '
'--assume-yes {0}' 'apt-get autoremove '
'-qq {0}'
.format(all_packages), shell=True, .format(all_packages), shell=True,
stdin=None, stdout=f, stderr=f, stdin=None, stdout=f, stderr=f,
executable="/bin/bash") executable="/bin/bash")