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/syncEnvironment.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/backend/syncEnvironment.py') 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() -- cgit v1.2.3