mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 11:51:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix prefligh buildbot

Browse Source 
BUG=none
TEST=Ran it by hand and verified that the error message goes away.

Before this change there is an error about merge_branch already existing.

Change-Id: I8393da46d6bebf1f40d253863cfe4c28b76c1b8e

Review URL: http://codereview.chromium.org/3127036
This commit is contained in:
Mandeep Singh Baines 2010-08-26 10:32:16 -07:00
parent 393266b499
commit fafb895a4c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cros_mark_as_stable.py
View File

@ -110,10 +110,6 @@ def _PrintUsageAndDie(error_message=''):
else:
sys.exit(1)
def _BranchExists(name):
"""Returns True is the branch exists"""
return _RunCommand('git branch').split().count(name) != 0
def _PushChange():
"""Pushes changes to the git repository.
@ -142,8 +138,6 @@ def _PushChange():
merge_branch.CreateBranch()
if not merge_branch.Exists():
generate_test_report.Die('Unable to create merge branch.')
_RunCommand('git checkout -b %s %s' % (
merge_branch_name, gflags.FLAGS.tracking_branch))
_RunCommand('git merge --squash %s' % _STABLE_BRANCH_NAME)
_RunCommand('git commit -m "%s"' % description)
# Ugh. There has got to be an easier way to push to a tracking branch