X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=4e43d21ddf9d07583bb64d69123ae54745b83faa;hp=afdddf260def9f4ab82db83fc84fd5381df53a6b;hb=e5d430e4208757b874443779b75ca884a143aa6a;hpb=7646c04136bd156af29671bd1081378f6a398aff

diff --git a/dgit b/dgit
index afdddf26..4e43d21d 100755
--- a/dgit
+++ b/dgit
@@ -2,8 +2,8 @@
 # dgit
 # Integration between git and Debian-style archives
 #
-# Copyright (C)2013-2017 Ian Jackson
-# Copyright (C)2017 Sean Whitton
+# Copyright (C)2013-2018 Ian Jackson
+# Copyright (C)2017-2018 Sean Whitton
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -129,6 +129,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 %opts_opt_map = ('dget' => \@dget, # accept for compatibility
 		     'curl' => \@curl,
@@ -148,7 +150,9 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'gbp-build' => \@gbp_build,
                      'gbp-pq' => \@gbp_pq,
                      'ch' => \@changesopts,
-                     'mergechanges' => \@mergechanges);
+                     'mergechanges' => \@mergechanges,
+                     'pbuilder' => \@pbuilder,
+                     'cowbuilder' => \@cowbuilder);
 
 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
 our %opts_cfg_insertpos = map {
@@ -166,7 +170,6 @@ our $keyid;
 autoflush STDOUT 1;
 
 our $supplementary_message = '';
-our $need_split_build_invocation = 1;
 our $split_brain = 0;
 
 END {
@@ -275,14 +278,16 @@ sub quiltmode_splitbrain () {
 }
 
 sub opts_opt_multi_cmd {
+    my $extra = shift;
     my @cmd;
     push @cmd, split /\s+/, shift @_;
+    push @cmd, @$extra;
     push @cmd, @_;
     @cmd;
 }
 
 sub gbp_pq {
-    return opts_opt_multi_cmd @gbp_pq;
+    return opts_opt_multi_cmd [], @gbp_pq;
 }
 
 sub dgit_privdir () {
@@ -570,6 +575,7 @@ main usages:
   dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
   dgit [dgit-opts] build [dpkg-buildpackage-opts]
   dgit [dgit-opts] sbuild [sbuild-opts]
+  dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
   dgit [dgit-opts] push [dgit-opts] [suite]
   dgit [dgit-opts] push-source [dgit-opts] [suite]
   dgit [dgit-opts] rpush build-host:build-dir ...
@@ -818,7 +824,8 @@ sub access_forpush () {
 }
 
 sub pushing () {
-    die "$access_forpush ?" if ($access_forpush // 1) ne 1;
+    confess 'internal error '.Dumper($access_forpush)," ?" if
+	defined $access_forpush and !$access_forpush;
     badcfg "pushing but distro is configured readonly"
 	if access_forpush_config() eq '0';
     $access_forpush = 1;
@@ -4433,7 +4440,8 @@ END
     responder_send_command("param isuite $isuite");
     responder_send_command("param tagformat $tagformat");
     if (defined $maintviewhead) {
-	die unless ($protovsn//4) >= 4;
+	confess "internal error (protovsn=$protovsn)"
+	    if defined $protovsn and $protovsn < 4;
 	responder_send_command("param maint-view $maintviewhead");
     }
 
@@ -5617,8 +5625,6 @@ END
 	quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
     }
 
-    die 'bug' if $split_brain && !$need_split_build_invocation;
-
     changedir $maindir;
     runcmd_ordryrun_local
         @git, qw(pull --ff-only -q), "$playground/work", qw(master);
@@ -6103,6 +6109,7 @@ sub build_or_push_prep_early () {
     $isuite = getfield $clogp, 'Distribution';
     $package = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
+    $dscfn = dscfn($version);
 }
 
 sub build_prep_early () {
@@ -6175,23 +6182,11 @@ sub changesopts () {
 
 sub massage_dbp_args ($;$) {
     my ($cmd,$xargs) = @_;
-    # We need to:
-    #
-    #  - if we're going to split the source build out so we can
-    #    do strange things to it, massage the arguments to dpkg-buildpackage
-    #    so that the main build doessn't build source (or add an argument
-    #    to stop it building source by default).
-    #
-    #  - add -nc to stop dpkg-source cleaning the source tree,
-    #    unless we're not doing a split build and want dpkg-source
-    #    as cleanmode, in which case we can do nothing
-    #
+    # Since we split the source build out so we can do strange things
+    # to it, massage the arguments to dpkg-buildpackage so that the
+    # main build doessn't build source (or add an argument to stop it
+    # building source by default).
     debugcmd '#massaging#', @$cmd if $debuglevel>1;
-#print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
-    if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
-	$clean_using_builder = 1;
-	return WANTSRC_BUILDER;
-    }
     # -nc has the side effect of specifying -b if nothing else specified
     # and some combinations of -S, -b, et al, are errors, rather than
     # later simply overriding earlie.  So we need to:
@@ -6207,13 +6202,11 @@ sub massage_dbp_args ($;$) {
     push @$cmd, '-nc';
 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
     my $r = WANTSRC_BUILDER;
-    if ($need_split_build_invocation) {
-	printdebug "massage split $dmode.\n";
-	$r = $dmode =~ m/[S]/     ?  WANTSRC_SOURCE :
-	     $dmode =~ y/gGF/ABb/ ?  WANTSRC_SOURCE | WANTSRC_BUILDER :
-	     $dmode =~ m/[ABb]/   ?                   WANTSRC_BUILDER :
-	     die "$dmode ?";
-    }
+    printdebug "massage split $dmode.\n";
+    $r = $dmode =~ m/[S]/  ?  WANTSRC_SOURCE :
+      $dmode =~ y/gGF/ABb/ ?  WANTSRC_SOURCE | WANTSRC_BUILDER :
+      $dmode =~ m/[ABb]/   ?                   WANTSRC_BUILDER :
+      die "$dmode ?";
     printdebug "massage done $r $dmode.\n";
     push @$cmd, $dmode;
 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
@@ -6301,6 +6294,10 @@ sub postbuild_mergechanges_vanilla ($) {
 
 sub cmd_build {
     build_prep_early();
+    $buildproductsdir eq '..' or print STDERR <<END;
+$us: warning: build-products-dir set, but not supported by dgit build
+$us: warning: things may go wrong or files may go to the wrong place
+END
     my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
     my $wantsrc = massage_dbp_args \@dbp;
     build_prep($wantsrc);
@@ -6337,7 +6334,6 @@ sub cmd_gbp_build {
     if ($gbp_make_orig) {
 	clean_tree();
 	$cleanmode = 'none'; # don't do it again
-	$need_split_build_invocation = 1;
     }
 
     my @dbp = @dpkgbuildpackage;
@@ -6351,7 +6347,7 @@ sub cmd_gbp_build {
 	    $gbp_build[0] = 'gbp buildpackage';
 	}
     }
-    my @cmd = opts_opt_multi_cmd @gbp_build;
+    my @cmd = opts_opt_multi_cmd [], @gbp_build;
 
     push @cmd, (qw(-us -uc --git-no-sign-tags),
 		"--git-builder=".(shellquote @dbp));
@@ -6412,7 +6408,6 @@ sub build_source {
 	unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
 	    or fail "remove $sourcechanges: $!";
     }
-    $dscfn = dscfn($version);
     my @cmd = (@dpkgsource, qw(-b --));
     my $leafdir;
     if (building_source_in_playtree()) {
@@ -6489,26 +6484,63 @@ sub cmd_push_source {
     dopush();
 }
 
-sub cmd_sbuild {
-    build_prep(WANTSRC_SOURCE); # not BUILDER because sbuild uses the .dsc
+sub binary_builder {
+    my ($bbuilder, $pbmc_msg, @args) = @_;
+    build_prep(WANTSRC_SOURCE);
     build_source();
     midbuild_checkchanges();
     in_bpd {
 	if (act_local()) {
-	    stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
+	    stat_exists $dscfn or fail "$dscfn (in build products dir): $!";
 	    stat_exists $sourcechanges
-		or fail "$sourcechanges (in parent directory): $!";
+		or fail "$sourcechanges (in build products dir): $!";
 	}
-	runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
+	runcmd_ordryrun_local @$bbuilder, @args;
     };
     maybe_unapply_patches_again();
     in_bpd {
-	postbuild_mergechanges(<<END);
+	postbuild_mergechanges($pbmc_msg);
+    };
+}
+
+sub cmd_sbuild {
+    build_prep_early();
+    binary_builder(\@sbuild, <<END, qw(-d), $isuite, @ARGV, $dscfn);
 perhaps you need to pass -A ?  (sbuild's default is to build only
 arch-specific binaries; dgit 1.4 used to override that.)
 END
-    };
-}    
+}
+
+sub pbuilder ($) {
+    my ($pbuilder) = @_;
+    build_prep_early();
+    # @ARGV is allowed to contain only things that should be passed to
+    # pbuilder under debbuildopts; just massage those
+    my $wantsrc = massage_dbp_args \@ARGV;
+    fail "you asked for a builder but your debbuildopts didn't ask for".
+      " any binaries -- is this really what you meant?"
+      unless $wantsrc & WANTSRC_BUILDER;
+    fail "we must build a .dsc to pass to the builder but your debbuiltopts".
+      " forbids the building of a source package; cannot continue"
+      unless $wantsrc & WANTSRC_SOURCE;
+    # We do not want to include the verb "build" in @pbuilder because
+    # the user can customise @pbuilder and they shouldn't be required
+    # to include "build" in their customised value.  However, if the
+    # user passes any additional args to pbuilder using the dgit
+    # option --pbuilder:foo, such args need to come after the "build"
+    # 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);
+}
+
+sub cmd_pbuilder {
+    pbuilder(\@pbuilder);
+}
+
+sub cmd_cowbuilder {
+    pbuilder(\@cowbuilder);
+}
 
 sub cmd_quilt_fixup {
     badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
@@ -6943,10 +6975,6 @@ sub parseopts () {
 		push @ropts, $_;
 		$tagformat_want = [ $1, 'command line', 1 ];
 		# 1 menas overrides distro configuration
-	    } elsif (m/^--always-split-source-build$/s) {
-		# undocumented, was once for testing, now a no-op
-		push @ropts, $_;
-		$need_split_build_invocation = 1;
 	    } elsif (m/^--config-lookup-explode=(.+)$/s) {
 		# undocumented, for testing
 		push @ropts, $_;
@@ -7027,8 +7055,8 @@ sub check_env_sanity () {
 	foreach my $name (qw(PIPE CHLD)) {
 	    my $signame = "SIG$name";
 	    my $signum = eval "POSIX::$signame" // die;
-	    ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
-		die "$signame is set to something other than SIG_DFL\n";
+	    die "$signame is set to something other than SIG_DFL\n"
+		if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
 	    $blocked->ismember($signum) and
 		die "$signame is blocked\n";
 	}
@@ -7100,8 +7128,6 @@ sub parseopts_late_defaults () {
 	$$vr = $v;
     }
 
-    $need_split_build_invocation ||= quiltmode_splitbrain();
-
     fail "dgit: --include-dirty is not supported in split view quilt mode"
 	if $split_brain && $includedirty;