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>

diff --git a/dgit b/dgit
index a5f93145f8ebea94d948fad55cbef5da6e2e19d3..922d719642ea38783b9fcb3abd179a60ec0c6c48 100755 (executable)
--- 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 2c9dbaea53a60284db45576a8498ff591691f0d0..56eed0b6b98b91e65d0fbe3ae78b34298b4bae00 100755 (executable)
--- 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