Skip to content

Commit

Permalink
Fix fun Travis DCO check YAML parsing issues (especially with commit…
Browse files Browse the repository at this point in the history
… messages that start with any kind of whitespace, like this one intentionally does)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
  • Loading branch information
tianon committed Jan 30, 2014
1 parent 43b7667 commit c8d1596
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion hack/travis/dco.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from env import commit_range

commit_format = '-%n hash: "%h"%n author: %aN <%aE>%n message: |%n%w(0,2,2)%B'
commit_format = '-%n hash: "%h"%n author: %aN <%aE>%n message: |%n%w(0,2,2).%B'

gitlog = subprocess.check_output([
'git', 'log', '--reverse',
Expand All @@ -24,6 +24,11 @@
failed_commits = 0

for commit in commits:
commit['message'] = commit['message'][1:]
# trim off our '.' that exists just to prevent fun YAML parsing issues
# see https://github.com/dotcloud/docker/pull/3836#issuecomment-33723094
# and https://travis-ci.org/dotcloud/docker/builds/17926783

commit['stat'] = subprocess.check_output([
'git', 'log', '--format=format:', '--max-count=1',
'--name-status', commit['hash'], '--',
Expand Down

0 comments on commit c8d1596

Please sign in to comment.