Merge lp://staging/~jelmer/bzr-builder/force-native into lp://staging/bzr-builder

Proposed by Jelmer Vernooij
Status: Merged
Approved by: James Westby
Approved revision: 115
Merged at revision: 111
Proposed branch: lp://staging/~jelmer/bzr-builder/force-native
Merge into: lp://staging/bzr-builder
Diff against target: 208 lines (+146/-2)
2 files modified
cmds.py (+59/-2)
tests/test_blackbox.py (+87/-0)
To merge this branch: bzr merge lp://staging/~jelmer/bzr-builder/force-native
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+42799@code.staging.launchpad.net

Description of the change

Add a --force-native option to "bzr dailydeb".

This option will apply all quilt patches and update the debian/source/format directory if the package is currently in the "3.0 (quilt)" format.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Hi,

Thanks for doing this, it is fairly unobtrusive and solves a common problem,
so I'm happy to have it.

70 + f.write("3.0 (native)")

Should that have a newline?

75 +def force_native_format(working_tree_path):

Should this die if it doesn't recognise the format marker?

93 + Option("force-native",
94 + help="Force the source package format to be native."),

Should this be an option? I can't really think of a reason why people
wouldn't want this. Is it just being conservative? Maybe have the option,
but invert the default?

Thanks,

James

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

On Tue, 2010-12-07 at 16:56 +0000, James Westby wrote:
> Thanks for doing this, it is fairly unobtrusive and solves a common problem,
> so I'm happy to have it.
>
> 70 + f.write("3.0 (native)")
> Should that have a newline?
Hmm, that's a good point. Both with and without seems to be allowed, but
with is more common. Fixed.

> 75 +def force_native_format(working_tree_path):
> Should this die if it doesn't recognise the format marker?
Yeah, better safe than sorry (and we don't support "2.0" at this point).

> 93 + Option("force-native",
> 94 + help="Force the source package format to be native."),

> Should this be an option? I can't really think of a reason why people
> wouldn't want this. Is it just being conservative? Maybe have the option,
> but invert the default?
Yeah, I was mainly being conservative. But you're right, without this
option things wouldn't really work anyway. I've killed it.

Cheers,

Jelmer

114. By Jelmer Vernooij

include newline in debian/source/format.

115. By Jelmer Vernooij

Kill --force-native option, error out on unknown source formats.

Revision history for this message
James Westby (james-w) wrote :

Looks good.

Thanks,

James

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches