From 99455bbb94f298cd101c3e43227647ccf7aaaf1b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Dec 2022 22:10:33 +0000 Subject: add an aditional matchphrase to the dependency solver, add color support && pep8 the whole backend --- src/backend/syncenv.py | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) (limited to 'src/backend/syncenv.py') diff --git a/src/backend/syncenv.py b/src/backend/syncenv.py index 5c07c3a..5a571c8 100644 --- a/src/backend/syncenv.py +++ b/src/backend/syncenv.py @@ -7,42 +7,57 @@ import sisyphus.getfs def gentooRepo(): os.chdir(sisyphus.getfs.gentooRepoDir) - localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) - remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) + 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) + gitExecStage1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage1.wait() - gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE) + gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode( + ).strip().replace('refs/remotes/', '').split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage2.wait() def redcoreRepo(): os.chdir(sisyphus.getfs.redcoreRepoDir) - localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) - remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) + 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) + gitExecStage1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage1.wait() - gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE) + gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode( + ).strip().replace('refs/remotes/', '').split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage2.wait() def portageConfigRepo(): os.chdir(sisyphus.getfs.portageConfigDir) - localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) - remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) + 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) gitExecStage1.wait() - gitExecStage2 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) + gitExecStage2 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage2.wait() - gitExecStage3 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE) + gitExecStage3 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode( + ).strip().replace('refs/remotes/', '').split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage3.wait() - gitExecStage4 = subprocess.Popen(['git', 'stash', 'apply'], stdout=subprocess.PIPE) + gitExecStage4 = subprocess.Popen( + ['git', 'stash', 'apply'], stdout=subprocess.PIPE) gitExecStage4.wait() - gitExecStage5 = subprocess.Popen(['git', 'stash', 'clear'], stdout=subprocess.PIPE) + gitExecStage5 = subprocess.Popen( + ['git', 'stash', 'clear'], stdout=subprocess.PIPE) gitExecStage5.wait() - gitExecStage6 = subprocess.Popen(['git', 'gc', '--prune=now', '--quiet'], stdout=subprocess.PIPE) + gitExecStage6 = subprocess.Popen( + ['git', 'gc', '--prune=now', '--quiet'], stdout=subprocess.PIPE) gitExecStage6.wait() -- cgit v1.2.3