From 382526fe605683e67f979e26d48b2889230efb6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Oct 2022 23:18:00 +0100 Subject: avoid repetitions --- src/backend/syncEnvironment.py | 6 +++--- src/backend/updateAll.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/syncEnvironment.py b/src/backend/syncEnvironment.py index a961dd1..15ba3c3 100644 --- a/src/backend/syncEnvironment.py +++ b/src/backend/syncEnvironment.py @@ -4,7 +4,7 @@ import os import subprocess import sisyphus.getFilesystem -def syncGentooRepo(): +def gentooRepo(): os.chdir(sisyphus.getFilesystem.gentooRepoDir) localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) @@ -15,7 +15,7 @@ def syncGentooRepo(): gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage2.wait() -def syncRedcoreRepo(): +def redcoreRepo(): os.chdir(sisyphus.getFilesystem.redcoreRepoDir) localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) @@ -26,7 +26,7 @@ def syncRedcoreRepo(): gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage2.wait() -def syncPortageConfigRepo(): +def portageConfigRepo(): os.chdir(sisyphus.getFilesystem.portageConfigDir) localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) diff --git a/src/backend/updateAll.py b/src/backend/updateAll.py index 6ee7ea0..dedb8d4 100644 --- a/src/backend/updateAll.py +++ b/src/backend/updateAll.py @@ -11,9 +11,9 @@ import sisyphus.syncEnvironment def syncAll(): sisyphus.purgeEnvironment.cache() - sisyphus.syncEnvironment.syncGentooRepo() - sisyphus.syncEnvironment.syncRedcoreRepo() - sisyphus.syncEnvironment.syncPortageConfigRepo() + sisyphus.syncEnvironment.gentooRepo() + sisyphus.syncEnvironment.redcoreRepo() + sisyphus.syncEnvironment.portageConfigRepo() sisyphus.syncDatabase.syncRemote() @animation.wait('fetching updates') -- cgit v1.2.3