Hi, Raphael Hertzog a écrit , Le 06/05/2011 09:18: > Hi, > > On Fri, 06 May 2011, pini wrote: >> The attached patch appears to solve my problem, with >> --extend-diff-ignore specified either from the command line or from a >> debian/source/[local-]options file. > > Except it's not correct. See below. > > What version of git-buildpackage are you using? The one from testing: 0.5.22. It misses the commit pointed out by Guido.
> > The problem here is more a bug of git-buildpackage than a bug of > dpkg-source. But I thought is was already fixed. In unstable, yes. > >> Rationals are: >> * options from the command line should be interpreted first >> * then should come options from debian/source/options >> * and finally options from debian/source/local-options > > Not at all. The command line should always override what you have > in debian/source/options. Thus they should be interpreted last. > > The fact that git-buildpackage adds option to the command line for you > doesn't change anything to the general logic that the command line > should take precedence over a configuration file. In that case debian/source[local-]options are *not* configuration files (they would be if they were - say - $HOME/.dpkg-sourcerc). They are files targeted specifically at the package they belong to and shouldn't be voided by a random helper command line. Anyway, I admit that YMMV and since my problem is solved by the git-buildpackage version currently in unstable I won't elaborate further :) > >> * --extend-diff-ignore should actually extend diff-ignore instead of the >> default diff-ignore regex. > > In practice since --extend-diff-ignore is put in debian/source/*, they > are interpreted early enough that diff_ignore_regex is always empty at > that point (unless you have set "diff-ignore" in debian/source/* as well). > > So we deliberately change the default regex only. Then later on, > either the command-line will have -i and we will enable it, > or the source format will implicitly enable -i. > > If you use -isomething, it's because you want to overwrite the entire > diff_ignore_regexp. And it's normal that --extend-diff-ignore is ignored > in that context. > > However I agree that --extend-diff-ignore used after -isomething should > probably extend the previous setting (for example if you have diff-ignore in > debian/source/options and extend-diff-ignore in > debian/source/local-options). I have pushed a fix for this but this is > unrelated to your problem. :-) > > For the rest, you should probably upgrade to a newer git-buildpackage > because the latest version only gives "-i -I" to dpkg-buildpackage. > Thus closing this bug. Thanks, _g.
signature.asc
Description: OpenPGP digital signature
