bzr-builddeb

Merge lp://staging/~jelmer/bzr-builddeb/get-source-format into lp://staging/bzr-builddeb

get-source-format
Merge into trunk

Proposed by Jelmer Vernooij on 2011-07-15

Status:

Merged

Approved by:

James Westby on 2011-07-15

Approved revision:

583

Merged at revision:

582

Proposed branch:

lp://staging/~jelmer/bzr-builddeb/get-source-format

Merge into:

lp://staging/bzr-builddeb

Diff against target:

34 lines (+10/-2)

2 files modified

tests/test_util.py (+6/-0)
util.py (+4/-2)

To merge this branch:

bzr merge lp://staging/~jelmer/bzr-builddeb/get-source-format

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Bzr-builddeb-hackers		2011-07-15	Pending
Review via email: mp+68090@code.staging.launchpad.net

Description of the change

Fix the use of get_source_format when debian/source/format is unversioned.

Revision history for this message

James Westby (james-w) wrote on 2011-07-15:

On Fri, 15 Jul 2011 14:20:03 -0000, Jelmer Vernooij <email address hidden> wrote:
> if not tree.has_filename("debian/source/format"):
> return FORMAT_1_0
> - return tree.get_file_text(tree.path2id("debian/source/format")).strip()
> + text = tree.get_file_text(tree.path2id("debian/source/format"),
> + "debian/source/format")
> + return text.strip()

Looks good, but perhaps we could make all those magic strings one
variable?

Thanks,

James

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2011-07-15:

On Fri, 2011-07-15 at 14:46 +0000, James Westby wrote:
> On Fri, 15 Jul 2011 14:20:03 -0000, Jelmer Vernooij <email address hidden> wrote:
> > if not tree.has_filename("debian/source/format"):
> > return FORMAT_1_0
> > - return tree.get_file_text(tree.path2id("debian/source/format")).strip()
> > + text = tree.get_file_text(tree.path2id("debian/source/format"),
> > + "debian/source/format")
> > + return text.strip()
>
> Looks good, but perhaps we could make all those magic strings one
> variable?
That seems reasonable - updated in the current branch.