X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=4e43d21ddf9d07583bb64d69123ae54745b83faa;hb=e5d430e4208757b874443779b75ca884a143aa6a;hp=6e8b757e8c825cf5f15dd6ae147100d49b3ac063;hpb=1d3df1eb9db77e4745a067a20e5312043383286b;p=dgit.git

diff --git a/dgit b/dgit
index 6e8b757e..4e43d21d 100755
--- a/dgit
+++ b/dgit
@@ -824,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;
@@ -4439,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");
     }
 
@@ -6292,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);
@@ -7049,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";
 	}