control: tag -1 +patch Hello,
On Sun 29 Jul 2018 at 09:50AM +0800, Sean Whitton wrote: > I think this is likely to be implemented in pbuilder so here is a bug so > we remember to patch dgit to use the new option. > > We'd also want to remove the warning about SOURCE_ONLY_CHANGES=yes from > dgit(1). Thank you to Mattia Rizzolo for implementing this! Applying these patches does mean that `dgit pbuilder` will probably error out with older pbuilder installed, such as the version in stretch. But it looks like the pbuilder maintainers keep pbuilder up-to-date in stretch-backports, so this seems okay. SOURCE_ONLY_CHANGES=yes is pretty popular so it seems important to prevent prospective dgit users from having to remove it from their pbuilder config as soon as we can. -- Sean Whitton
From d9e268bd9e3da473491ee6f3940c514d6c762c81 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhit...@spwhitton.name>
Date: Sat, 10 Nov 2018 19:33:16 -0700
Subject: [PATCH 1/2] dgit: pass --no-source-only-changes to pbuilder
Closes: #904862
Signed-off-by: Sean Whitton <spwhit...@spwhitton.name>
---
debian/control | 2 +-
dgit | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index eef4dca..a6e3d72 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
libjson-perl, ca-certificates,
libtext-iconv-perl, libtext-glob-perl
Recommends: ssh-client
-Suggests: sbuild | pbuilder | cowbuilder
+Suggests: sbuild | pbuilder (>= 0.230) | cowbuilder
Architecture: all
Description: git interoperability with the Debian archive
dgit (with the associated infrastructure) makes it possible to
diff --git a/dgit b/dgit
index e104838..7faf1c4 100755
--- a/dgit
+++ b/dgit
@@ -6762,7 +6762,7 @@ sub pbuilder ($) {
# verb. opts_opt_multi_cmd does all of that.
binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
- $dscfn);
+ qw(--no-source-only-changes), $dscfn);
}
sub cmd_pbuilder {
--
2.11.0
From 97bc0e11d923f14f6cb36ad6af1ef77438dd5133 Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Sat, 10 Nov 2018 19:36:37 -0700 Subject: [PATCH 2/2] dgit(1): drop warning about SOURCE_ONLY_CHANGES=yes in pbuilderrc dgit now overrides this configuration option if the user happens to have set it. Signed-off-by: Sean Whitton <spwhit...@spwhitton.name> --- dgit.1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dgit.1 b/dgit.1 index c3dd420..47b436b 100644 --- a/dgit.1 +++ b/dgit.1 @@ -215,11 +215,6 @@ option. If you want to pass other options to pbuilder, use the (remember that dgit options should appear between \fBdgit\fR and \fBpbuilder\fR). -You should ensure that in your pbuilderrc you do -.B not -have the setting -.B SOURCE_ONLY_CHANGES=yes -as this may cause trouble. .TP \fBdgit cowbuilder\fR [\fIdebbuildopts\fP] Like \fBdgit pbuilder\fR, but uses -- 2.11.0
signature.asc
Description: PGP signature
