summaryrefslogtreecommitdiff
path: root/src/backend/installPkg.py
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-19 10:47:26 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-19 10:47:26 +0100
commitc4483c9ef08ffa8d34bba179a473e291e626d163 (patch)
treebd1fb849e208e95ea327343fd16a93537bd5c5be /src/backend/installPkg.py
parent7caca0ac338b531a7dc48ed64b93b3af26187afa (diff)
we want realtime output in these, so bring back io.TextIOWrapper
Diffstat (limited to 'src/backend/installPkg.py')
-rw-r--r--src/backend/installPkg.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py
index 7b98fc4..e9373da 100644
--- a/src/backend/installPkg.py
+++ b/src/backend/installPkg.py
@@ -1,6 +1,7 @@
#!/usr/bin/python3
import atexit
+import io
import os
import shutil
import subprocess
@@ -42,13 +43,12 @@ def start(pkgname):
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, stderr=subprocess.PIPE)
- stdout, stderr = portageExec.communicate()
-
- for portageOutput in stdout.decode('ascii').splitlines():
- if not "These are the packages that would be merged, in order:" in portageOutput:
- if not "Calculating dependencies" in portageOutput:
- print(portageOutput)
+ 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.syncDatabase.syncLocal()
else:
sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -83,13 +83,13 @@ def startqt(pkgname):
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, 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)
- for portageOutput in stdout.decode('ascii').splitlines():
- if not "These are the packages that would be merged, in order:" in portageOutput:
- if not "Calculating dependencies" in portageOutput:
- print(portageOutput)
+ 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.syncDatabase.syncLocal()