Merge lp:~statik/tarmac/newline-in-author into lp:tarmac

Proposed by Elliot Murphy
Status: Merged
Approved by: Paul Hummer
Approved revision: 144
Merged at revision: not available
Proposed branch: lp:~statik/tarmac/newline-in-author
Merge into: lp:tarmac
Diff against target: None lines
To merge this branch: bzr merge lp:~statik/tarmac/newline-in-author
Reviewer Review Type Date Requested Status
Paul Hummer Approve
Review via email:

Commit message

Fix a bug where authors with a newline in their name causes Tarmac to fail.

To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

This fixes a failure in tarmac for me, one of the contributors to one of my projects had a newline in his author name and tarmac was failing. I believe this is safe, please merge.

Revision history for this message
Paul Hummer (rockstar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tarmac/'
2--- tarmac/ 2009-07-13 18:40:04 +0000
3+++ tarmac/ 2009-08-06 16:53:51 +0000
4@@ -73,7 +73,9 @@
5 # Only query for authors if last_rev is not null:
6 if last_rev != 'null:':
7 rev = self.branch.repository.get_revision(last_rev)
8- self.author_list.extend(rev.get_apparent_authors())
9+ apparent_authors = rev.get_apparent_authors()
10+ self.author_list.extend(
11+ [a.replace('\n', '') for a in apparent_authors])
13 def merge(self, branch):
14 '''Merge from another tarmac.branch.Branch instance.'''


People subscribed via source and target branches