bzr-builddeb

Merge lp://staging/~jelmer/bzr-builddeb/find-changelog-mentions-branch-root into lp://staging/bzr-builddeb

find-changelog-mentions-branch-root
Merge into trunk

Proposed by Jelmer Vernooij on 2012-01-02

Status:

Superseded

Proposed branch:

lp://staging/~jelmer/bzr-builddeb/find-changelog-mentions-branch-root

Merge into:

lp://staging/bzr-builddeb

Diff against target:

85 lines (+20/-6) (has conflicts)

4 files modified

debian/changelog (+9/-0)
errors.py (+1/-1)
tests/blackbox/test_get_tar.py (+1/-1)
util.py (+9/-4)

Text conflict in debian/changelog

To merge this branch:

bzr merge lp://staging/~jelmer/bzr-builddeb/find-changelog-mentions-branch-root

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Bzr-builddeb-hackers		2012-01-02	Pending
Review via email: mp+87300@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2012-01-05.

Description of the change

Mention the full path of changelog in error messages mentioning that it is missing.

Revision history for this message

James Westby (james-w) wrote on 2012-01-04:

37 - changelog_file = 'debian/changelog'
38 + changelog_file = None
39 top_level = False
40 t.lock_read()
41 try:
42 if not t.has_filename(changelog_file):

Does that end up calling t.has_filename(None)?

Thanks,

James

lp://staging/~jelmer/bzr-builddeb/find-changelog-mentions-branch-root updated on 2012-01-05

680. By Jelmer Vernooij on 2012-01-05: Fix tests.

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2012-01-05:

> 37 - changelog_file = 'debian/changelog'
> 38 + changelog_file = None
> 39 top_level = False
> 40 t.lock_read()
> 41 try:
> 42 if not t.has_filename(changelog_file):
>
> Does that end up calling t.has_filename(None)?
Sorry, that was sloppy of me - I'd forgotten to commit my last set of changes. It does indeed fail horribly without those.

I've now uploaded the rest of them.