diff options
Diffstat (limited to 'src/backend/upgradeSrc.py')
| -rw-r--r-- | src/backend/upgradeSrc.py | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py index e378a8a..9badd95 100644 --- a/src/backend/upgradeSrc.py +++ b/src/backend/upgradeSrc.py @@ -1,6 +1,7 @@ #!/usr/bin/python3 import os +import io import shutil import subprocess import sys @@ -40,13 +41,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") @@ -73,13 +74,13 @@ def start(): os.remove(binary.rstrip().split("/")[1]) portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--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,26 +88,26 @@ def start(): print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + " ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n") if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y": portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--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") else: portageExec = subprocess.Popen(['emerge', '--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', '--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 "Local copy of remote index is up-to-date and will be used." in portageOutput: - if not "ebuild" in portageOutput: - if not "binary" in portageOutput: - print(portageOutput) + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + if not "Local copy of remote index is up-to-date and will be used." in portageOutput.rstrip(): + if not "ebuild" in portageOutput.rstrip(): + if not "binary" in portageOutput.rstrip(): + print(portageOutput.rstrip()) + portageExec.wait() sys.exit("\n" + "Cannot proceed; Apply the above changes to your portage configuration files and try again; Quitting." + "\n") else: sys.exit("\nYou need root permissions to do this, exiting!\n") |