From 44f48531452bc55114161df8f33a0cd49c7d438c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Sep 2022 21:53:32 +0100 Subject: fix Popen.communicate calls --- src/backend/autoRemoveAll.py | 4 ++-- src/backend/getBinhost.py | 2 +- src/backend/installPkg.py | 4 ++-- src/backend/installSrc.py | 8 ++++---- src/backend/resolveDeps.py | 4 ++-- src/backend/setProfile.py | 4 ++-- src/backend/syncEnvironment.py | 20 ++++++++++---------- src/backend/uninstallAll.py | 4 ++-- src/backend/uninstallAllForce.py | 2 +- src/backend/upgradePkg.py | 4 ++-- src/backend/upgradeSrc.py | 8 ++++---- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/backend/autoRemoveAll.py b/src/backend/autoRemoveAll.py index 27d892d..65274a6 100644 --- a/src/backend/autoRemoveAll.py +++ b/src/backend/autoRemoveAll.py @@ -11,7 +11,7 @@ import sisyphus.syncDatabase def start(): if sisyphus.checkEnvironment.root(): portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\nYou need root permissions to do this, exiting!\n") @@ -24,5 +24,5 @@ def startqt(): for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() diff --git a/src/backend/getBinhost.py b/src/backend/getBinhost.py index faff197..849dba8 100644 --- a/src/backend/getBinhost.py +++ b/src/backend/getBinhost.py @@ -11,5 +11,5 @@ def start(): if "PORTAGE_BINHOST" in portageOutput.rstrip(): isBinhost = str(portageOutput.rstrip().split("=")[1].strip('\"')) - stdout, stderr = portageExec.communicate() + portageExec.communicate() return isBinhost diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py index a4d71c9..c6af1d7 100644 --- a/src/backend/installPkg.py +++ b/src/backend/installPkg.py @@ -49,7 +49,7 @@ def start(pkgname): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -92,5 +92,5 @@ def startqt(pkgname): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() diff --git a/src/backend/installSrc.py b/src/backend/installSrc.py index 9fc7eec..466ee0a 100644 --- a/src/backend/installSrc.py +++ b/src/backend/installSrc.py @@ -47,7 +47,7 @@ def start(pkgname): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -80,7 +80,7 @@ def start(pkgname): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -94,7 +94,7 @@ def start(pkgname): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -107,7 +107,7 @@ def start(pkgname): if not "binary" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() 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") diff --git a/src/backend/resolveDeps.py b/src/backend/resolveDeps.py index 580bfd4..b889d5d 100644 --- a/src/backend/resolveDeps.py +++ b/src/backend/resolveDeps.py @@ -33,7 +33,7 @@ def package(pkgname): isSource = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) areSources.append(isSource) - stdout, stderr = portageExec.communicate() + portageExec.communicate() return areBinaries,areSources,needsConfig @animation.wait('resolving dependencies') @@ -65,5 +65,5 @@ def world(): isSource = str(portageOutput.rstrip().split("]")[1].split("[")[0].strip("\ ")) areSources.append(isSource) - stdout, stderr = portageExec.communicate() + portageExec.communicate() return areBinaries,areSources,needsConfig diff --git a/src/backend/setProfile.py b/src/backend/setProfile.py index 87d5437..78a8b60 100644 --- a/src/backend/setProfile.py +++ b/src/backend/setProfile.py @@ -8,11 +8,11 @@ import subprocess def start(): if platform.uname()[4] == 'x86_64': eselectExec = subprocess.Popen(['eselect', 'profile', 'set', 'default/linux/amd64/17.1/hardened'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = eselectExec.communicate() + eselectExec.communicate() if platform.uname()[4] == 'aarch64': eselectExec = subprocess.Popen(['eselect', 'profile', 'set', 'default/linux/arm64/17.0'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = eselectExec.communicate() + eselectExec.communicate() envExec = subprocess.Popen(['env-update'], stdout=subprocess.DEVNULL) envExec.wait() diff --git a/src/backend/syncEnvironment.py b/src/backend/syncEnvironment.py index 04b662a..47beb77 100644 --- a/src/backend/syncEnvironment.py +++ b/src/backend/syncEnvironment.py @@ -10,10 +10,10 @@ def syncStage1(): remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) gitExecStage1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage1.communicate() + gitExecStage1.communicate() gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage2.communicate() + gitExecStage2.communicate() def syncStage2(): os.chdir(sisyphus.getFilesystem.redcoreRepoDir) @@ -21,10 +21,10 @@ def syncStage2(): remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) gitExecStage1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage1.communicate() + gitExecStage1.communicate() gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage2.communicate() + gitExecStage2.communicate() def syncStage3(): os.chdir(sisyphus.getFilesystem.portageConfigDir) @@ -32,14 +32,14 @@ def syncStage3(): remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) gitExecStage1 = subprocess.Popen(['git', 'stash'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage1.communicate() + gitExecStage1.communicate() gitExecStage2 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage2.communicate() + gitExecStage2.communicate() gitExecStage3 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage3.communicate() + gitExecStage3.communicate() gitExecStage4 = subprocess.Popen(['git', 'stash', 'apply'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage4.communicate() + gitExecStage4.communicate() gitExecStage5 = subprocess.Popen(['git', 'stash', 'clear'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage5.communicate() + gitExecStage5.communicate() gitExecStage6 = subprocess.Popen(['git', 'gc', '--prune=now', '--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = gitExecStage6.communicate() + gitExecStage6.communicate() diff --git a/src/backend/uninstallAll.py b/src/backend/uninstallAll.py index ca985b3..bb54851 100644 --- a/src/backend/uninstallAll.py +++ b/src/backend/uninstallAll.py @@ -11,7 +11,7 @@ import sisyphus.syncDatabase def start(pkgname): if sisyphus.checkEnvironment.root(): portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\nYou need root permissions to do this, exiting!\n") @@ -24,5 +24,5 @@ def startqt(pkgname): for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() diff --git a/src/backend/uninstallAllForce.py b/src/backend/uninstallAllForce.py index 8a952c6..d639fe8 100644 --- a/src/backend/uninstallAllForce.py +++ b/src/backend/uninstallAllForce.py @@ -8,7 +8,7 @@ import sisyphus.syncDatabase def start(pkgname): if sisyphus.checkEnvironment.root(): portageExec = subprocess.Popen(['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\nYou need root permissions to do this, exiting!\n") diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py index 59b4572..c2176e9 100644 --- a/src/backend/upgradePkg.py +++ b/src/backend/upgradePkg.py @@ -49,7 +49,7 @@ def start(): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -96,7 +96,7 @@ def startqt(): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: print("\n" + "No package upgrades found; Quitting." + "\n") diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py index 728b88c..db4f8cb 100644 --- a/src/backend/upgradeSrc.py +++ b/src/backend/upgradeSrc.py @@ -47,7 +47,7 @@ def start(): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -80,6 +80,7 @@ def start(): if not "Calculating dependencies" in portageOutput.rstrip(): print(portageOutput.rstrip()) + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -87,14 +88,13 @@ 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 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()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -107,7 +107,7 @@ def start(): if not "binary" in portageOutput.rstrip(): print(portageOutput.rstrip()) - stdout, stderr = portageExec.communicate() + portageExec.communicate() 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") -- cgit v1.2.3