summaryrefslogtreecommitdiff
path: root/src/backend/upgrade.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/upgrade.py')
-rw-r--r--src/backend/upgrade.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index a6a540a..54fcd5c 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -42,14 +42,14 @@ def start():
if os.path.exists(binary.rstrip().split("/")[1]):
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)
+ 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 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")
@@ -87,7 +87,8 @@ def startqt():
if os.path.exists(binary.rstrip().split("/")[1]):
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)
+ 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)
@@ -96,7 +97,6 @@ def startqt():
if not "Calculating dependencies" in portageOutput.rstrip():
print(portageOutput.rstrip())
- portageExec.wait()
sisyphus.database.syncLocal()
else:
print("\n" + "No package upgrades found; Quitting." + "\n")