Dgit.pm: Replace many die calls with confess

As a rule of thumb, anything where we would end up printing the line
number in Dgit.pm is wrong.  Most of these are internal errors or
unexpected syscall failures.

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

1 files changed, 46 insertions, 46 deletions

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 8260e9f..d2484f9 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -148,18 +148,18 @@ sub setup_sigwarn () {
 
 sub initdebug ($) { 
     ($debugprefix) = @_;
-    open DEBUG, ">/dev/null" or die $!;
+    open DEBUG, ">/dev/null" or confess $!;
 }
 
 sub enabledebug () {
-    open DEBUG, ">&STDERR" or die $!;
+    open DEBUG, ">&STDERR" or confess $!;
     DEBUG->autoflush(1);
     $debuglevel ||= 1;
 }
     
 sub enabledebuglevel ($) {
     my ($newlevel) = @_; # may be undef (eg from env var)
-    die if $debuglevel;
+    confess if $debuglevel;
     $newlevel //= 0;
     $newlevel += 0;
     return unless $newlevel;
@@ -181,7 +181,7 @@ sub printdebug {
     print DEBUG $debugprefix unless $printdebug_noprefix;
     pop @_ while @_ and !length $_[-1];
     return unless @_;
-    print DEBUG @_ or die $!;
+    print DEBUG @_ or confess $!;
     $printdebug_noprefix = $_[-1] !~ m{\n$};
 }
 
@@ -214,9 +214,9 @@ sub shellquote {
 sub printcmd {
     my $fh = shift @_;
     my $intro = shift @_;
-    print $fh $intro," " or die $!;
-    print $fh shellquote @_ or die $!;
-    print $fh "\n" or die $!;
+    print $fh $intro," " or confess $!;
+    print $fh shellquote @_ or confess $!;
+    print $fh "\n" or confess $!;
 }
 
 sub debugcmd {
@@ -284,7 +284,7 @@ sub stat_exists ($) {
     my ($f) = @_;
     return 1 if stat $f;
     return 0 if $!==&ENOENT;
-    die "stat $f: $!";
+    confess "stat $f: $!";
 }
 
 sub _us () {
@@ -307,7 +307,7 @@ sub ensuredir ($) {
     my ($dir) = @_; # does not create parents
     return if mkdir $dir;
     return if $! == EEXIST;
-    die "mkdir $dir: $!";
+    confess "mkdir $dir: $!";
 }
 
 sub must_getcwd () {
@@ -347,7 +347,7 @@ sub waitstatusmsg () {
 sub failedcmd_report_cmd {
     my $intro = shift @_;
     $intro //= __ "failed command";
-    { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or die $!; };
+    { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess $!; };
 }
 
 sub failedcmd_waitstatus {
@@ -391,11 +391,11 @@ sub cmdoutput_errok {
     confess Dumper(\@_)." ?" if grep { !defined } @_;
     local $printdebug_when_debuglevel = $debugcmd_when_debuglevel;
     debugcmd "|",@_;
-    open P, "-|", @_ or die "$_[0] $!";
+    open P, "-|", @_ or confess "$_[0] $!";
     my $d;
     $!=0; $?=0;
     { local $/ = undef; $d = <P>; }
-    die $! if P->error;
+    confess $! if P->error;
     if (!close P) { printdebug "=>!$?\n"; return undef; }
     chomp $d;
     if ($debuglevel > 0) {
@@ -455,18 +455,18 @@ sub git_cat_file ($;$) {
     if (!$gcf_pid) {
 	my @cmd = qw(git cat-file --batch);
 	debugcmd "GCF|", @cmd;
-	$gcf_pid = open2 $gcf_o, $gcf_i, @cmd or die $!;
+	$gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess $!;
     }
     printdebug "GCF>| ", $objname, "\n";
-    print $gcf_i $objname, "\n" or die $!;
+    print $gcf_i $objname, "\n" or confess $!;
     my $x = <$gcf_o>;
     printdebug "GCF<| ", $x;
     if ($x =~ m/ (missing)$/) { return $chk->($1, undef); }
-    my ($type, $size) = $x =~ m/^.* (\w+) (\d+)\n/ or die "$objname ?";
+    my ($type, $size) = $x =~ m/^.* (\w+) (\d+)\n/ or confess "$objname ?";
     my $data;
-    (read $gcf_o, $data, $size) == $size or die "$objname $!";
+    (read $gcf_o, $data, $size) == $size or confess "$objname $!";
     $x = <$gcf_o>;
-    $x eq "\n" or die "$objname ($_) $!";
+    $x eq "\n" or confess "$objname ($_) $!";
     return $chk->($type, $data);
 }
 
@@ -494,22 +494,22 @@ sub git_for_each_ref ($$;$) {
     if (defined $gitdir) {
 	@cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd);
     }
-    open GFER, "-|", @cmd or die $!;
+    open GFER, "-|", @cmd or confess $!;
     debugcmd "|", @cmd;
     while (<GFER>) {
-	chomp or die "$_ ?";
+	chomp or confess "$_ ?";
 	printdebug "|> ", $_, "\n";
-	m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or die "$_ ?";
+	m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or confess "$_ ?";
 	$func->($1,$2,$3,$4);
     }
-    $!=0; $?=0; close GFER or die "$pattern $? $!";
+    $!=0; $?=0; close GFER or confess "$pattern $? $!";
 }
 
 sub git_get_ref ($) {
     # => '' if no such ref
     my ($refname) = @_;
     local $_ = $refname;
-    s{^refs/}{[r]efs/} or die "$refname $_ ?";
+    s{^refs/}{[r]efs/} or confess "$refname $_ ?";
     return cmdoutput qw(git for-each-ref --format=%(objectname)), $_;
 }
 
@@ -592,11 +592,11 @@ sub git_slurp_config_src ($) {
     local $/="\0";
 
     my $r = { };
-    open GITS, "-|", @cmd or die $!;
+    open GITS, "-|", @cmd or confess $!;
     while (<GITS>) {
-	chomp or die;
+	chomp or confess;
 	printdebug "=> ", (messagequote $_), "\n";
-	m/\n/ or die "$_ ?";
+	m/\n/ or confess "$_ ?";
 	push @{ $r->{$`} }, $'; #';
     }
     $!=0; $?=0;
@@ -636,7 +636,7 @@ sub parsecontrolfh ($$;$) {
 	my $issigned= $c->get_option('is_pgp_signed');
 	if (!defined $issigned) {
 	    $dpkgcontrolhash_noissigned= 1;
-	    seek $fh, 0,0 or die "seek $desc: $!";
+	    seek $fh, 0,0 or confess "seek $desc: $!";
 	} elsif ($issigned) {
 	    fail "control file $desc is (already) PGP-signed. ".
 		" Note that dgit push needs to modify the .dsc and then".
@@ -653,7 +653,7 @@ sub parsecontrol {
     my $fh = new IO::Handle;
     open $fh, '<', $file or die "$file: $!";
     my $c = parsecontrolfh($fh,$desc,$allowsigned);
-    $fh->error and die $!;
+    $fh->error and confess $!;
     close $fh;
     return $c;
 }
@@ -662,7 +662,7 @@ sub parsechangelog {
     my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
     my $p = new IO::Handle;
     my @cmd = (qw(dpkg-parsechangelog), @_);
-    open $p, '-|', @cmd or die $!;
+    open $p, '-|', @cmd or confess $!;
     $c->parse($p);
     $?=0; $!=0; close $p or failedcmd @cmd;
     return $c;
@@ -680,19 +680,19 @@ sub parsechangelog_loop ($$$) {
     # @$clogcmd is qw(dpkg-parsechangelog ...some...options...)
     # calls $fn->($thisstanza, $desc);
     debugcmd "|",@$clogcmd;
-    open CLOGS, "-|", @$clogcmd or die $!;
+    open CLOGS, "-|", @$clogcmd or confess $!;
     for (;;) {
 	my $stanzatext = do { local $/=""; <CLOGS>; };
 	printdebug "clogp stanza ".Dumper($stanzatext) if $debuglevel>1;
 	last if !defined $stanzatext;
 
 	my $desc = "$descbase, entry no.$.";
-	open my $stanzafh, "<", \$stanzatext or die;
+	open my $stanzafh, "<", \$stanzatext or confess;
 	my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
 
 	$fn->($thisstanza, $desc);
     }
-    die $! if CLOGS->error;
+    confess $! if CLOGS->error;
     close CLOGS or $?==SIGPIPE or failedcmd @$clogcmd;
 }	
 
@@ -702,18 +702,18 @@ sub make_commit_text ($) {
     my @cmd = (qw(git hash-object -w -t commit --stdin));
     debugcmd "|",@cmd;
     print Dumper($text) if $debuglevel > 1;
-    my $child = open2($out, $in, @cmd) or die $!;
+    my $child = open2($out, $in, @cmd) or confess $!;
     my $h;
     eval {
-	print $in $text or die $!;
-	close $in or die $!;
+	print $in $text or confess $!;
+	close $in or confess $!;
 	$h = <$out>;
-	$h =~ m/^\w+$/ or die;
+	$h =~ m/^\w+$/ or confess;
 	$h = $&;
 	printdebug "=> $h\n";
     };
     close $out;
-    waitpid $child, 0 == $child or die "$child $!";
+    waitpid $child, 0 == $child or confess "$child $!";
     $? and failedcmd @cmd;
     return $h;
 }
@@ -728,7 +728,7 @@ sub reflog_cache_insert ($$$) {
     my $parent = $ref; $parent =~ s{/[^/]+$}{};
     ensuredir "$maindir_gitcommon/logs/$parent";
     my $makelogfh = new IO::File "$maindir_gitcommon/logs/$ref", '>>'
-      or die $!;
+      or confess $!;
 
     my $oldcache = git_get_ref $ref;
 
@@ -756,15 +756,15 @@ sub reflog_cache_lookup ($$) {
     # you must have called record_maindir
     my @cmd = (qw(git log -g), '--pretty=format:%H %gs', $ref);
     debugcmd "|(probably)",@cmd;
-    my $child = open GC, "-|";  defined $child or die $!;
+    my $child = open GC, "-|";  defined $child or confess $!;
     if (!$child) {
-	chdir $maindir or die $!;
+	chdir $maindir or confess $!;
 	if (!stat "$maindir_gitcommon/logs/$ref") {
-	    $! == ENOENT or die $!;
+	    $! == ENOENT or confess $!;
 	    printdebug ">(no reflog)\n";
 	    finish 0;
 	}
-	exec @cmd; die $!;
+	exec @cmd; confess $!;
     }
     while (<GC>) {
 	chomp;
@@ -773,7 +773,7 @@ sub reflog_cache_lookup ($$) {
 	close GC;
 	return $1;
     }
-    die $! if GC->error;
+    confess $! if GC->error;
     failedcmd unless close GC;
     return undef;
 }
@@ -897,11 +897,11 @@ sub playtree_setup (;$) {
     #   $maindir_gitdir     contains our main working "dgit", HEAD, etc.
     #   $maindir_gitcommon  the shared stuff, including .objects
     rmtree('.git/objects');
-    symlink "$maindir_gitcommon/objects",'.git/objects' or die $!;
+    symlink "$maindir_gitcommon/objects",'.git/objects' or confess $!;
     ensuredir '.git/info';
-    open GA, "> .git/info/attributes" or die $!;
-    print GA "* $negate_harmful_gitattrs\n" or die $!;
-    close GA or die $!;
+    open GA, "> .git/info/attributes" or confess $!;
+    print GA "* $negate_harmful_gitattrs\n" or confess $!;
+    close GA or confess $!;
 }
 
 1;