Skip to content

slapos
slapos
Commit 942e802a authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

Do not use pull --rebase. 

No local commit is supposed to exist.
parent 532b5e7c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
slapos/recipe/testnode/profile_testnode.py
View file @ 942e802a
...@@ -126,8 +126,8 @@ def run(args): ...@@ -126,8 +126,8 @@ def run(args):
subprocess.check_call([config['git_binary'], 'checkout', '--force', subprocess.check_call([config['git_binary'], 'checkout', '--force',
'--track', '-b', config['branch'], 'origin/'+config['branch']], '--track', '-b', config['branch'], 'origin/'+config['branch']],
cwd=repository_clone) cwd=repository_clone)
subprocess.check_call([config['git_binary'], 'pull', '--rebase'], subprocess.check_call([config['git_binary'], 'reset', '--hard',
cwd=repository_clone) '@{upstream}'], cwd=repository_clone)
except Exception: except Exception:
print 'Retrying git in 60s' print 'Retrying git in 60s'
time.sleep(60) time.sleep(60)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7