diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-27 15:28:24 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-27 15:28:24 +0100 |
commit | 348b995ead9fbcab890da5d222af36402f33d68c (patch) | |
tree | 77dd348507f98850b03de16b8d5d5797eeed36b3 /dgit | |
parent | 627a025403c21c87c4a56135c4b05810104507da (diff) |
When invoking git-buildpackage via dgit gbp-build, consider our command line arguments when massaging the dpkg-buildpackage arguments, so that we don't end up giving dpkg-buildpackage contradictory instructions.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2944,8 +2944,8 @@ sub changesopts () { return (changesopts_initial(), changesopts_version()); } -sub massage_dbp_args ($) { - my ($cmd) = @_; +sub massage_dbp_args ($;$) { + my ($cmd,$xargs) = @_; if ($cleanmode eq 'dpkg-source') { $suppress_clean = 1; return; @@ -2956,7 +2956,7 @@ sub massage_dbp_args ($) { push @newcmd, '-nc'; # and some combinations of -S, -b, et al, are errors, rather than # later simply overriding earlier - push @newcmd, '-F' unless grep { m/^-[bBASF]$/ } @$cmd; + push @newcmd, '-F' unless grep { m/^-[bBASF]$/ } (@$cmd, @$xargs); push @newcmd, @$cmd; @$cmd = @newcmd; } @@ -2972,7 +2972,7 @@ sub cmd_build { sub cmd_gbp_build { my @dbp = @dpkgbuildpackage; - massage_dbp_args \@dbp; + massage_dbp_args \@dbp, \@ARGV; my @cmd = (qw(git-buildpackage -us -uc --git-no-sign-tags), "--git-builder=@dbp"); |