summaryrefslogtreecommitdiff
path: root/src/backend/syncEnvironment.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/syncEnvironment.py')
-rw-r--r--src/backend/syncEnvironment.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/syncEnvironment.py b/src/backend/syncEnvironment.py
index 47beb77..4473115 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)
- gitExecStage1.communicate()
+ gitExecStage1.wait()
gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- gitExecStage2.communicate()
+ gitExecStage2.wait()
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)
- gitExecStage1.communicate()
+ gitExecStage1.wait()
gitExecStage2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- gitExecStage2.communicate()
+ gitExecStage2.wait()
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)
- gitExecStage1.communicate()
+ gitExecStage1.wait()
gitExecStage2 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- gitExecStage2.communicate()
+ gitExecStage2.wait()
gitExecStage3 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode().strip().replace('refs/remotes/','').split() + ['--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- gitExecStage3.communicate()
+ gitExecStage3.wait()
gitExecStage4 = subprocess.Popen(['git', 'stash', 'apply'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- gitExecStage4.communicate()
+ gitExecStage4.wait()
gitExecStage5 = subprocess.Popen(['git', 'stash', 'clear'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- gitExecStage5.communicate()
+ gitExecStage5.wait()
gitExecStage6 = subprocess.Popen(['git', 'gc', '--prune=now', '--quiet'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- gitExecStage6.communicate()
+ gitExecStage6.wait()