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

Don't mask out errors in cros_mark_as_stable

Browse Source 
Change-Id: Ib6722b99008f8515aecc3f27896963291d197947

Review URL: http://codereview.chromium.org/3130031
This commit is contained in:
Chris Sosa 2010-08-18 18:03:46 -07:00
parent fb0160fe6d
commit a33a445a8d
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cros_mark_as_stable.py
View File

@ -137,15 +137,11 @@ def _PushChange():
_RunCommand('git remote update') _RunCommand('git remote update')
_RunCommand('git checkout -b %s %s' % ( _RunCommand('git checkout -b %s %s' % (
merge_branch_name, gflags.FLAGS.tracking_branch)) merge_branch_name, gflags.FLAGS.tracking_branch))
try:
_RunCommand('git merge --squash %s' % _STABLE_BRANCH_NAME) _RunCommand('git merge --squash %s' % _STABLE_BRANCH_NAME)
_RunCommand('git commit -m "%s"' % description) _RunCommand('git commit -m "%s"' % description)
# Ugh. There has got to be an easier way to push to a tracking branch # Ugh. There has got to be an easier way to push to a tracking branch
_RunCommand('git config push.default tracking') _RunCommand('git config push.default tracking')
_RunCommand('git push') _RunCommand('git push')
finally:
_RunCommand('git checkout %s' % _STABLE_BRANCH_NAME)
_RunCommand('git branch -D %s' % merge_branch_name)
def _RunCommand(command): def _RunCommand(command):