summaryrefslogtreecommitdiff
path: root/src/backend/install.py
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-16 01:06:50 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-16 01:06:50 +0100
commit96423b52302a01fa3a4922961bd8e072a5c46e15 (patch)
treed31bdfd6415b4dec2cd427024435ef2ce47669ac /src/backend/install.py
parentd5f7286a28caf0a7f628c09b515e7ed59a1a85fb (diff)
bugfix :
* subprocess.Popen child processes can "sometimes" generate a very large output, causing a deadlock (**cough** dependency solver **cough**) * use subprocess.Popen.communicate instead of subprocess.Popen.wait to avoid such issues * see : https://docs.python.org/3/library/subprocess.html#subprocess.Popen.wait
Diffstat (limited to 'src/backend/install.py')
-rw-r--r--src/backend/install.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/install.py b/src/backend/install.py
index f6aeb67..c9b2d67 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -42,14 +42,14 @@ def start(pkgname):
if os.path.exists(binary.rstrip().split("/")[1]):
os.remove(binary.rstrip().split("/")[1])
- portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE)
+ portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ stdout, stderr = portageExec.communicate()
for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
if not "Calculating dependencies" in portageOutput.rstrip():
print(portageOutput.rstrip())
- portageExec.wait()
sisyphus.database.syncLocal()
else:
sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -83,7 +83,8 @@ def startqt(pkgname):
if os.path.exists(binary.rstrip().split("/")[1]):
os.remove(binary.rstrip().split("/")[1])
- portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE)
+ portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ stdout, stderr = portageExec.communicate()
# kill portage if the program dies or it's terminated by the user
atexit.register(sisyphus.killportage.start, portageExec)
@@ -92,5 +93,4 @@ def startqt(pkgname):
if not "Calculating dependencies" in portageOutput.rstrip():
print(portageOutput.rstrip())
- portageExec.wait()
sisyphus.database.syncLocal()