From 574406631c9e90910b30611e7ab9cf3b2b706e45 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 29 Aug 2019 23:45:36 +0200 Subject: [PATCH] Fix stack purge non interactive --- wo/cli/plugins/stack.py | 6 +++--- wo/core/aptget.py | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index cd75b94..33b6f01 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -680,7 +680,7 @@ class WOStackController(CementBaseController): 'Remove stacks [y/N]?') if start_remove != "Y" and start_remove != "y": Log.error(self, "Not starting stack removal") - Log.info(self, "Removing stacks, please wait...") + if (set(["nginx-custom"]).issubset(set(apt_packages))): WOService.stop_service(self, 'nginx') @@ -892,7 +892,6 @@ class WOStackController(CementBaseController): 'Purge stacks [y/N]') if start_purge != "Y" and start_purge != "y": Log.error(self, "Not starting stack purge") - Log.info(self, "Purging stacks, please wait...") if (set(["nginx-custom"]).issubset(set(apt_packages))): WOService.stop_service(self, 'nginx') @@ -913,11 +912,12 @@ class WOStackController(CementBaseController): "uninstaller.sh -y -f") 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.auto_remove(self) if (packages): + Log.info(self, "Purging packages, please wait...") WOFileUtils.remove(self, packages) WOAptGet.auto_remove(self) diff --git a/wo/core/aptget.py b/wo/core/aptget.py index ce66dff..3e3fe53 100644 --- a/wo/core/aptget.py +++ b/wo/core/aptget.py @@ -148,14 +148,16 @@ class WOAptGet(): try: with open('/var/log/wo/wordops.log', 'a') as f: if purge: - proc = subprocess.Popen('apt-get autoremove --purge ' - '--assume-yes {0}' + proc = subprocess.Popen('DEBIAN_FRONTEND=noninteractive ' + 'apt-get autoremove --purge ' + '-qq {0}' .format(all_packages), shell=True, stdin=None, stdout=f, stderr=f, executable="/bin/bash") else: - proc = subprocess.Popen('apt-get autoremove ' - '--assume-yes {0}' + proc = subprocess.Popen('DEBIAN_FRONTEND=noninteractive ' + 'apt-get autoremove ' + '-qq {0}' .format(all_packages), shell=True, stdin=None, stdout=f, stderr=f, executable="/bin/bash")