bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/quilt-empty-message into lp:bzr-builddeb

  1. quilt-empty-message
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 733
Merged at revision: 733
Proposed branch: lp:~jelmer/bzr-builddeb/quilt-empty-message
Merge into: lp:bzr-builddeb
Diff against target: 25 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
errors.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/quilt-empty-message
Reviewer Review Type Date Requested Status
Bzr-builddeb-hackers Pending
Review via email: mp+113940@code.launchpad.net

Description of the change

Cope with quilt messages being empty during output.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Approved by jam, thanks :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-20 15:45:31 +0000
3+++ debian/changelog 2012-07-09 10:07:26 +0000
4@@ -1,3 +1,9 @@
5+bzr-builddeb (2.8.5) UNRELEASED; urgency=low
6+
7+ * Cope with quilt output being empty in error message. LP: #1014543
8+
9+ -- Jelmer Vernooij <jelmer@debian.org> Mon, 09 Jul 2012 12:04:50 +0200
10+
11 bzr-builddeb (2.8.4) unstable; urgency=low
12
13 * Add dependency on quilt. LP: #951207
14
15=== modified file 'errors.py'
16--- errors.py 2012-01-05 16:09:21 +0000
17+++ errors.py 2012-07-09 10:07:26 +0000
18@@ -244,6 +244,6 @@
19 def __init__(self, kind, msg):
20 BzrError.__init__(self)
21 self.kind = kind
22- if msg.count("\n") == 1:
23+ if msg is not None and msg.count("\n") == 1:
24 msg = msg.strip()
25 self.msg = msg

Subscribers

People subscribed via source and target branches