AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes to roll_deps for the bots

Browse Source 
The bots are running an older version of git which does not support the
-q/--quiet flag for branch or the --short flag for symbolic-ref.

BUG=
R=halcanary@google.com

Review URL: https://codereview.chromium.org/134723002

git-svn-id: http://skia.googlecode.com/svn/trunk@13030 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
borenet@google.com 2014-01-10 21:02:25 +00:00
parent 698dfa465c
commit 4d5e1366c9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/roll_deps.py
View File

@ -577,8 +577,8 @@ class GitBranchCLUpload(object):
if self._stash:
vsp.check_call([git, 'stash', 'save'])
try:
self._original_branch = vsp.strip_output(
[git, 'symbolic-ref', '--short', 'HEAD'])
full_branch = vsp.strip_output([git, 'symbolic-ref', 'HEAD'])
self._original_branch = full_branch.split('/')[-1]
except (subprocess.CalledProcessError,):
self._original_branch = vsp.strip_output(
[git, 'rev-parse', 'HEAD'])
@ -588,7 +588,7 @@ class GitBranchCLUpload(object):
if branch_exists(self._branch_name):
vsp.check_call([git, 'checkout', '-q', 'master'])
vsp.check_call([git, 'branch', '-q', '-D', self._branch_name])
vsp.check_call([git, 'branch', '-D', self._branch_name])
vsp.check_call(
[git, 'checkout', '-q', '-b', self._branch_name, 'origin/master'])
@ -632,7 +632,7 @@ class GitBranchCLUpload(object):
vsp.check_call([git, 'checkout', '-q', self._original_branch])
if self._config.default_branch_name == self._branch_name:
vsp.check_call([git, 'branch', '-q', '-D', self._branch_name])
vsp.check_call([git, 'branch', '-D', self._branch_name])
if self._stash:
vsp.check_call([git, 'stash', 'pop'])