diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-11-06 16:10:51 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-01 23:53:45 +0100 |
commit | 81aaaee0875d911dca013460b1087e5b56922c0f (patch) | |
tree | 3b2edd2b4b5d7b455172e3f0df0c8a8fa85282f7 | |
parent | adcac7cc282e2683ebdeaee9c53b2d98c0bf8661 (diff) |
When running dpkg-buildpackage, cope if user specified -g or -G.
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 44aedd2..49a72bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ dgit (1.5~~) unstable; urgency=medium to change for the dgit user. New checks and improved behaviours: + * When running dpkg-buildpackage, cope if user specified -g or -G. * dgit sbuild: check that the set of .changes files found is as we expect, before calling mergechanges. * dgit sbuild: Rename the used-up .changes files to `.inmulti' to @@ -3058,7 +3058,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, @$xargs); + push @newcmd, '-F' unless grep { m/^-[bBASFgG]$/ } (@$cmd, @$xargs); push @newcmd, @$cmd; @$cmd = @newcmd; } |