mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-10 14:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify and clearify push logic.

Browse Source 
Change-Id: I5366fb930ca76f596f49d0312228aa5beeccbc31

BUG=chromium-os:8693
TEST=Ran it with and without dryrun and chrome uprev.

Review URL: http://codereview.chromium.org/5846005
This commit is contained in:
Chris Sosa 2010-12-16 20:01:58 -08:00
parent 78bc7d7415
commit e516dae950
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cros_mark_as_stable.py
View File

@ -252,7 +252,7 @@ def PushChange(stable_branch, tracking_branch):
merge_branch_name = 'merge_branch' merge_branch_name = 'merge_branch'
for push_try in range(num_retries + 1): for push_try in range(num_retries + 1):
try: try:
_SimpleRunCommand('git remote update') _SimpleRunCommand('repo sync .')
merge_branch = GitBranch(merge_branch_name, tracking_branch) merge_branch = GitBranch(merge_branch_name, tracking_branch)
merge_branch.CreateBranch() merge_branch.CreateBranch()
if not merge_branch.Exists(): if not merge_branch.Exists():