dgit: Pass --no-source-only-changes to pbuilder and cowbuilder

This will break with older versions of pbuilder and cowbuilder,
unfortunately.  That breakage can be worked around by passing dgit one
or both of the new options:
  --pbuilder!:--no-source-only-changes
  --cowbuilder!:--no-source-only-changes

Closes: #904862.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

2 files changed, 3 insertions, 3 deletions

diff --git a/dgit b/dgit
index a5f9314..922d719 100755
--- a/dgit
+++ b/dgit
@@ -132,8 +132,8 @@ our (@mergechanges) = qw(mergechanges -f);
 our (@gbp_build) = ('');
 our (@gbp_pq) = ('gbp pq');
 our (@changesopts) = ('');
-our (@pbuilder) = ("sudo -E pbuilder");
-our (@cowbuilder) = ("sudo -E cowbuilder");
+our (@pbuilder) = ("sudo -E pbuilder","--no-source-only-changes");
+our (@cowbuilder) = ("sudo -E cowbuilder","--no-source-only-changes");
 
 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
 		     'curl' => \@curl,
diff --git a/tests/tests/pbuilder b/tests/tests/pbuilder
index 2c9dbae..56eed0b 100755
--- a/tests/tests/pbuilder
+++ b/tests/tests/pbuilder
@@ -23,7 +23,7 @@ t-dgit -v0 --pbuilder="$troot/pretend-pbuilder" pbuilder -b
 # it would be nice to try passing -g on the end of the following line
 # to confirm it gets massaged into -A, but the example package is
 # RC-buggy in that it doesn't build with -A ..
-t-dgit -v0 --pbuilder="$troot/pretend-pbuilder" pbuilder
+t-dgit -v0 --pbuilder="$troot/pretend-pbuilder" --pbuilder!:--no-source-only-changes pbuilder
 
 t-dgit -wgf push --new