we want realtime output in these, so bring back io.TextIOWrapper

1 files changed, 11 insertions, 10 deletions

diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py
index 293dc66..d284402 100644
--- a/src/backend/upgradePkg.py
+++ b/src/backend/upgradePkg.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import atexit
+import io
 import os
 import shutil
 import subprocess
@@ -42,13 +43,13 @@ def start():
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], 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")
@@ -87,15 +88,15 @@ def startqt():
                     os.remove(binary.rstrip().split("/")[1])
 
             portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], 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()
         else:
             print("\n" + "No package upgrades found; Quitting." + "\n")