From f63eb33b4c7186f456b46f68b0e9475ef0167cdd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Sep 2022 23:44:50 +0100 Subject: only use pipes when absolutely needed --- src/backend/autoRemoveAll.py | 2 +- src/backend/setProfile.py | 4 ++-- src/backend/syncEnvironment.py | 20 ++++++++++---------- src/backend/uninstallAll.py | 2 +- src/backend/uninstallAllForce.py | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/backend/autoRemoveAll.py b/src/backend/autoRemoveAll.py index 18dd386..3165e4b 100644 --- a/src/backend/autoRemoveAll.py +++ b/src/backend/autoRemoveAll.py @@ -9,7 +9,7 @@ import sisyphus.syncDatabase def start(): if sisyphus.checkEnvironment.root(): - portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask']) portageExec.wait() sisyphus.syncDatabase.syncLocal() else: diff --git a/src/backend/setProfile.py b/src/backend/setProfile.py index d3942aa..a5d6480 100644 --- a/src/backend/setProfile.py +++ b/src/backend/setProfile.py @@ -7,11 +7,11 @@ import subprocess @animation.wait('setting up profile') 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) + eselectExec = subprocess.Popen(['eselect', 'profile', 'set', 'default/linux/amd64/17.1/hardened']) eselectExec.wait() if platform.uname()[4] == 'aarch64': - eselectExec = subprocess.Popen(['eselect', 'profile', 'set', 'default/linux/arm64/17.0'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + eselectExec = subprocess.Popen(['eselect', 'profile', 'set', 'default/linux/arm64/17.0']) eselectExec.wait() envExec = subprocess.Popen(['env-update'], stdout=subprocess.DEVNULL) diff --git a/src/backend/syncEnvironment.py b/src/backend/syncEnvironment.py index 4473115..7af1301 100644 --- a/src/backend/syncEnvironment.py +++ b/src/backend/syncEnvironment.py @@ -9,10 +9,10 @@ def syncStage1(): localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) 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) + gitExecStage1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet']) gitExecStage1.wait() - gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet']) gitExecStage2.wait() def syncStage2(): @@ -20,10 +20,10 @@ def syncStage2(): localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) 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) + gitExecStage1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet']) gitExecStage1.wait() - gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet']) gitExecStage2.wait() def syncStage3(): @@ -31,15 +31,15 @@ def syncStage3(): localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) - gitExecStage1 = subprocess.Popen(['git', 'stash'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage1 = subprocess.Popen(['git', 'stash']) gitExecStage1.wait() - gitExecStage2 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage2 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet']) gitExecStage2.wait() - gitExecStage3 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage3 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet']) gitExecStage3.wait() - gitExecStage4 = subprocess.Popen(['git', 'stash', 'apply'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage4 = subprocess.Popen(['git', 'stash', 'apply']) gitExecStage4.wait() - gitExecStage5 = subprocess.Popen(['git', 'stash', 'clear'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage5 = subprocess.Popen(['git', 'stash', 'clear']) gitExecStage5.wait() - gitExecStage6 = subprocess.Popen(['git', 'gc', '--prune=now', '--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + gitExecStage6 = subprocess.Popen(['git', 'gc', '--prune=now', '--quiet']) gitExecStage6.wait() diff --git a/src/backend/uninstallAll.py b/src/backend/uninstallAll.py index b11af3e..ca25628 100644 --- a/src/backend/uninstallAll.py +++ b/src/backend/uninstallAll.py @@ -9,7 +9,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) + portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname)) portageExec.wait() sisyphus.syncDatabase.syncLocal() else: diff --git a/src/backend/uninstallAllForce.py b/src/backend/uninstallAllForce.py index 1c37ace..d3e78ed 100644 --- a/src/backend/uninstallAllForce.py +++ b/src/backend/uninstallAllForce.py @@ -7,7 +7,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) + portageExec = subprocess.Popen(['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname)) portageExec.wait() sisyphus.syncDatabase.syncLocal() else: -- cgit v1.2.3