From 4fa81a14d7e657e3976c26c64748b5963a55c56d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 17 May 2018 10:45:50 +0100 Subject: make sure we leave no zombie alive --- src/backend/libsisyphus.py | 10 +++++----- src/frontend/gui/sisyphus-gui.py | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index ac7d7b2..1d05b8c 100755 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -192,28 +192,28 @@ def rescueDB(): def startInstall(pkgList): syncAll() portageExec = subprocess.Popen(['emerge', '-aq'] + pkgList) - portageExec.communicate() + portageExec.wait() syncLocalDatabase() # call portage to uninstall the package(s) (CLI frontend) def startUninstall(pkgList): portageExec = subprocess.Popen(['emerge', '--depclean', '-aq'] + pkgList) - portageExec.communicate() + portageExec.wait() syncLocalDatabase() # call portage to force-uninstall the package(s) (CLI frontend) def startUninstallForce(pkgList): portageExec = subprocess.Popen(['emerge', '--unmerge', '-aq'] + pkgList) - portageExec.communicate() + portageExec.wait() syncLocalDatabase() # call portage to remove orphan package(s) (CLI frontend) def removeOrphans(): portageExec = subprocess.Popen(['emerge', '--depclean', '-aq']) - portageExec.communicate() + portageExec.wait() syncLocalDatabase() # call portage to perform a system upgrade (CLI frontend) @@ -221,7 +221,7 @@ def removeOrphans(): def startUpgrade(): syncAll() portageExec = subprocess.Popen(['emerge', '-uDaNq', '--backtrack=100', '--with-bdeps=y', '@world']) - portageExec.communicate() + portageExec.wait() syncLocalDatabase() # call portage to search for package(s) (CLI frontend) diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 406ea7a..0f290c8 100755 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -377,6 +377,7 @@ class MainWorker(QtCore.QObject): atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) + portageExec.wait() syncLocalDatabase() self.finished.emit() @@ -389,6 +390,7 @@ class MainWorker(QtCore.QObject): atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) + portageExec.wait() syncLocalDatabase() self.finished.emit() @@ -400,6 +402,7 @@ class MainWorker(QtCore.QObject): atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) + portageExec.wait() syncLocalDatabase() self.finished.emit() @@ -411,6 +414,7 @@ class MainWorker(QtCore.QObject): atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) + portageExec.wait() syncLocalDatabase() self.finished.emit() -- cgit v1.2.3