diff options
| -rw-r--r-- | src/backend/sync.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/sync.py b/src/backend/sync.py index 5d3c098..ebea39c 100644 --- a/src/backend/sync.py +++ b/src/backend/sync.py @@ -4,23 +4,26 @@ import os import subprocess import sisyphus.filesystem -localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) -remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) - def portage(): os.chdir(sisyphus.filesystem.portageRepoDir) + 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', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage1.wait() def overlay(): os.chdir(sisyphus.filesystem.redcoreRepoDir) + 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', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE) gitExecStage1.wait() def portageCfg(): os.chdir(sisyphus.filesystem.portageConfigDir) + 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() |