diff options
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 242 |
1 files changed, 121 insertions, 121 deletions
@@ -516,7 +516,7 @@ sub protocol_send_file ($$) { print $fh $d or confess $!; } PF->error and die "$ourfn $!"; - print $fh "data-end\n" or die $!; + print $fh "data-end\n" or confess $!; close PF; } @@ -541,9 +541,9 @@ sub protocol_receive_file ($$) { } $fh; last unless $y; my $d = protocol_read_bytes $fh, $l; - print PF $d or die $!; + print PF $d or confess $!; } - close PF or die $!; + close PF or confess $!; } #---------- remote protocol support, responder ---------- @@ -553,7 +553,7 @@ sub responder_send_command ($) { return unless $we_are_responder; # called even without $we_are_responder printdebug ">> $command\n"; - print PO $command, "\n" or die $!; + print PO $command, "\n" or confess $!; } sub responder_send_file ($$) { @@ -588,8 +588,8 @@ sub initiator_expect (&) { sub progress { if ($we_are_responder) { my $m = join '', @_; - responder_send_command "progress ".length($m) or die $!; - print PO $m or die $!; + responder_send_command "progress ".length($m) or confess $!; + print PO $m or confess $!; } else { print @_, "\n"; } @@ -604,7 +604,7 @@ sub url_get { } my $what = $_[$#_]; progress "downloading $what..."; - my $r = $ua->get(@_) or die $!; + my $r = $ua->get(@_) or confess $!; return undef if $r->code == 404; $r->is_success or fail f_ "failed to fetch %s: %s", $what, $r->status_line; @@ -668,7 +668,7 @@ Perhaps the upload is stuck in incoming. Using the version from git. END sub badusage { - print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or die $!; + print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess $!; finish 8; } @@ -681,7 +681,7 @@ sub pre_help () { not_necessarily_a_tree(); } sub cmd_help () { - print __ $helpmsg or die $!; + print __ $helpmsg or confess $!; finish 0; } @@ -928,8 +928,8 @@ sub supplementary_message ($) { return; } elsif ($protovsn >= 3) { responder_send_command "supplementary-message ".length($msg) - or die $!; - print PO $msg or die $!; + or confess $!; + print PO $msg or confess $!; } } @@ -1066,7 +1066,7 @@ sub commit_getclogp ($) { } sub parse_dscdata () { - my $dscfh = new IO::File \$dscdata, '<' or die $!; + my $dscfh = new IO::File \$dscdata, '<' or confess $!; printdebug Dumper($dscdata) if $debuglevel>1; $dsc = parsecontrolfh($dscfh,$dscurl,1); printdebug Dumper($dsc) if $debuglevel>1; @@ -1289,12 +1289,12 @@ sub aptget_prep ($) { access_cfg('mirror'), $aptsuites, access_cfg('aptget-components') - or die $!; + or confess $!; ensuredir "$aptget_base/cache"; ensuredir "$aptget_base/lists"; - open CONF, ">", $aptget_configpath or die $!; + open CONF, ">", $aptget_configpath or confess $!; print CONF <<END; Debug::NoLocking "true"; APT::Get::List-Cleanup "false"; @@ -1314,10 +1314,10 @@ END Dir::Etc::preferencesparts )) { ensuredir "$aptget_base/$key"; - print CONF "$key \"$quoted_base/$key\";\n" or die $!; + print CONF "$key \"$quoted_base/$key\";\n" or confess $!; }; - my $oldatime = (time // die $!) - 1; + my $oldatime = (time // confess $!) - 1; foreach my $oldlist (<$aptget_base/lists/*Release>) { next unless stat_exists $oldlist; my ($mtime) = (stat _)[9]; @@ -1417,7 +1417,7 @@ sub dummycatapi_run_in_mirror ($@) { my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune, qw(x), $mirror, @$argl); debugcmd "-|", @cmd; - open FIA, "-|", @cmd or die $!; + open FIA, "-|", @cmd or confess $!; my $r = $fn->(); close FIA or ($!==0 && $?==141) or die failedcmd @cmd; return $r; @@ -1520,7 +1520,7 @@ sub sshpsql ($$$) { " export LC_MESSAGES=C; export LC_CTYPE=C;". " ".shellquote qw(psql -A), $dbname, qw(-c), $sql); debugcmd "|",@cmd; - open P, "-|", @cmd or die $!; + open P, "-|", @cmd or confess $!; while (<P>) { chomp or die; printdebug(">|$_|\n"); @@ -1821,7 +1821,7 @@ sub remove_stray_gits ($) { my ($what) = @_; my @gitscmd = qw(find -name .git -prune -print0); debugcmd "|",@gitscmd; - open GITS, "-|", @gitscmd or die $!; + open GITS, "-|", @gitscmd or confess $!; { local $/="\0"; while (<GITS>) { @@ -2278,9 +2278,9 @@ sub generate_commits_from_dsc () { new Dpkg::Compression::Process compression => $cname; @compr_cmd = $compr_proc->get_uncompress_cmdline(); my $compr_fh = new IO::Handle; - my $compr_pid = open $compr_fh, "-|" // die $!; + my $compr_pid = open $compr_fh, "-|" // confess $!; if (!$compr_pid) { - open STDIN, "<&", $input or die $!; + open STDIN, "<&", $input or confess $!; exec @compr_cmd; die "dgit (child): exec $compr_cmd[0]: $!\n"; } @@ -2288,23 +2288,23 @@ sub generate_commits_from_dsc () { } rmtree "_unpack-tar"; - mkdir "_unpack-tar" or die $!; + mkdir "_unpack-tar" or confess $!; my @tarcmd = qw(tar -x -f - --no-same-owner --no-same-permissions --no-acls --no-xattrs --no-selinux); - my $tar_pid = fork // die $!; + my $tar_pid = fork // confess $!; if (!$tar_pid) { - chdir "_unpack-tar" or die $!; - open STDIN, "<&", $input or die $!; + chdir "_unpack-tar" or confess $!; + open STDIN, "<&", $input or confess $!; exec @tarcmd; die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!; } - $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!; + $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess $!; !$? or failedcmd @tarcmd; close $input or (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd) - : die $!); + : confess $!); # finally, we have the results in "tarball", but maybe # with the wrong permissions @@ -2461,14 +2461,14 @@ END_T printdebug "import main commit\n"; - open C, ">../commit.tmp" or die $!; - print C <<END or die $!; + open C, ">../commit.tmp" or confess $!; + print C <<END or confess $!; tree $tree END - print C <<END or die $! foreach @tartrees; + print C <<END or confess $! foreach @tartrees; parent $_->{Commit} END - print C <<END or die $!; + print C <<END or confess $!; author $authline committer $authline @@ -2477,7 +2477,7 @@ $changes [dgit import $treeimporthow $package $cversion] END - close C or die $!; + close C or confess $!; my $rawimport_hash = make_commit qw(../commit.tmp); if (madformat $dsc->{format}) { @@ -2522,7 +2522,7 @@ END progress f_ "%s: trying slow absurd-git-apply...", $us; rename "../../gbp-pq-output","../../gbp-pq-output.0" or $!==ENOENT - or die $!; + or confess $!; } eval { die "forbid absurd git-apply\n" if $use_absurd @@ -2588,7 +2588,7 @@ Version actually in archive: %s (older) Last version pushed with dgit: %s (newer or same) %s END - __ $later_warning_msg or die $!; + __ $later_warning_msg or confess $!; @output = $lastpush_mergeinput; } else { # Same version. Use what's in the server git branch, @@ -2618,7 +2618,7 @@ sub complete_file_from_dsc ($$;$) { open F, "<", "$tf" or die "$tf: $!"; $fi->{Digester}->reset(); $fi->{Digester}->addfile(*F); - F->error and die $!; + F->error and confess $!; $got = $fi->{Digester}->hexdigest(); return $got eq $fi->{Hash}; }; @@ -2752,7 +2752,7 @@ sub git_lrfetch_sane { debugcmd "|",@lcmd; my %wantr; - open GITLS, "-|", @lcmd or die $!; + open GITLS, "-|", @lcmd or confess $!; while (<GITLS>) { printdebug "=> ", $_; m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?"; @@ -3173,7 +3173,7 @@ sub fetch_from_archive () { printdebug "del_lrfetchrefs: $objid $fullrefname\n"; if (!$gur) { $gur ||= new IO::Handle; - open $gur, "|-", qw(git update-ref --stdin) or die $!; + open $gur, "|-", qw(git update-ref --stdin) or confess $!; } printf $gur "delete %s %s\n", $fullrefname, $objid; } @@ -3194,7 +3194,7 @@ Commit referred to by archive: %s Last version pushed with dgit: %s %s END - __ $later_warning_msg or die $!; + __ $later_warning_msg or confess $!; @mergeinputs = ($lastpush_mergeinput); } else { # Archive has .dsc which is not a descendant of the last dgit @@ -3229,11 +3229,11 @@ END Package not found in the archive, but has allegedly been pushed using dgit. %s END - __ $later_warning_msg or die $!; + __ $later_warning_msg or confess $!; } else { printdebug "nothing found!\n"; if (defined $skew_warning_vsn) { - print STDERR f_ <<END, $skew_warning_vsn or die $!; + print STDERR f_ <<END, $skew_warning_vsn or confess $!; Warning: relevant archive skew detected. Archive allegedly contains %s @@ -3299,26 +3299,26 @@ END my $mcf = dgit_privdir()."/mergecommit"; open MC, ">", $mcf or die "$mcf $!"; - print MC <<END or die $!; + print MC <<END or confess $!; tree $tree END my @parents = grep { $_->{Commit} } @mergeinputs; @parents = reverse @parents if $compat_info->{ReverseParents}; - print MC <<END or die $! foreach @parents; + print MC <<END or confess $! foreach @parents; parent $_->{Commit} END - print MC <<END or die $!; + print MC <<END or confess $!; author $author committer $author END if (defined $compat_info->{Message}) { - print MC $compat_info->{Message} or die $!; + print MC $compat_info->{Message} or confess $!; } else { - print MC f_ <<END, $package, $cversion, $csuite or die $!; + print MC f_ <<END, $package, $cversion, $csuite or confess $!; Record %s (%s) in archive suite %s Record that @@ -3327,17 +3327,17 @@ END my ($mi) = (@_); my $mversion = mergeinfo_version $mi; printf MC " %-20s %s\n", $mversion, $mi->{Info} - or die $!; + or confess $!; }; $message_add_info->($mergeinputs[0]); - print MC __ <<END or die $!; + print MC __ <<END or confess $!; should be treated as descended from END $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs]; } - close MC or die $!; + close MC or confess $!; $hash = make_commit $mcf; } else { $hash = $mergeinputs[0]{Commit}; @@ -3362,7 +3362,7 @@ END my $got_vsn = getfield $gotclogp, 'Version'; printdebug "SKEW CHECK GOT $got_vsn\n"; if (version_compare($got_vsn, $skew_warning_vsn) < 0) { - print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or die $!; + print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess $!; Warning: archive skew detected. Using the available version: Archive allegedly contains %s @@ -3406,12 +3406,12 @@ sub setup_mergechangelogs (;$) { while (<ATTRS>) { chomp; next if m{^debian/changelog\s}; - print NATTRS $_, "\n" or die $!; + print NATTRS $_, "\n" or confess $!; } - ATTRS->error and die $!; + ATTRS->error and confess $!; close ATTRS; } - print NATTRS "debian/changelog merge=$driver\n" or die $!; + print NATTRS "debian/changelog merge=$driver\n" or confess $!; close NATTRS; set_local_git_config "$cb.name", __ 'debian/changelog merge driver'; @@ -3467,7 +3467,7 @@ sub is_gitattrs_setup () { printdebug "is_gitattrs_setup: found old macro\n"; return 0; } - $gai->error and die $!; + $gai->error and confess $!; printdebug "is_gitattrs_setup: found nothing\n"; return undef; } @@ -3488,8 +3488,8 @@ END my $af = "$maindir_gitcommon/info/attributes"; ensuredir "$maindir_gitcommon/info"; - open GAO, "> $af.new" or die $!; - print GAO <<END, __ <<ENDT or die $! unless defined $already; + open GAO, "> $af.new" or confess $!; + print GAO <<END, __ <<ENDT or confess $! unless defined $already; * dgit-defuse-attrs $new END @@ -3503,11 +3503,11 @@ ENDT $_ = $new; } chomp; - print GAO $_, "\n" or die $!; + print GAO $_, "\n" or confess $!; } - $gai->error and die $!; + $gai->error and confess $!; } - close GAO or die $!; + close GAO or confess $!; rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!; } @@ -3526,7 +3526,7 @@ sub check_gitattrs ($$) { my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:"); debugcmd "|",@cmd; my $gafl = new IO::File; - open $gafl, "-|", @cmd or die $!; + open $gafl, "-|", @cmd or confess $!; while (<$gafl>) { chomp or die; s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die; @@ -3551,7 +3551,7 @@ sub multisuite_suite_child ($$$) { # in child, sets things up, calls $fn->(), and returns undef # in parent, returns canonical suite name for $tsuite my $canonsuitefh = IO::File::new_tmpfile; - my $pid = fork // die $!; + my $pid = fork // confess $!; if (!$pid) { forkcheck_setup(); $isuite = $tsuite; @@ -3559,17 +3559,17 @@ sub multisuite_suite_child ($$$) { $debugprefix .= " "; progress f_ "fetching %s...", $tsuite; canonicalise_suite(); - print $canonsuitefh $csuite, "\n" or die $!; - close $canonsuitefh or die $!; + print $canonsuitefh $csuite, "\n" or confess $!; + close $canonsuitefh or confess $!; $fn->(); return undef; } - waitpid $pid,0 == $pid or die $!; + waitpid $pid,0 == $pid or confess $!; fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg() if $? && $?!=256*4; - seek $canonsuitefh,0,0 or die $!; + seek $canonsuitefh,0,0 or confess $!; local $csuite = <$canonsuitefh>; - die $! unless defined $csuite && chomp $csuite; + confess $! unless defined $csuite && chomp $csuite; if ($? == 256*4) { printdebug "multisuite $tsuite missing\n"; return $csuite; @@ -3712,9 +3712,9 @@ sub fork_for_multisuite ($) { } sub clone_set_head () { - open H, "> .git/HEAD" or die $!; - print H "ref: ".lref()."\n" or die $!; - close H or die $!; + open H, "> .git/HEAD" or confess $!; + print H "ref: ".lref()."\n" or confess $!; + close H or confess $!; } sub clone_finish ($) { my ($dstdir) = @_; @@ -3880,18 +3880,18 @@ sub get_source_format () { $options{$_} = 1; } } - F->error and die $!; + F->error and confess $!; close F; } else { - die $! unless $!==&ENOENT; + confess $! unless $!==&ENOENT; } if (!open F, "debian/source/format") { - die $! unless $!==&ENOENT; + confess $! unless $!==&ENOENT; return ''; } $_ = <F>; - F->error and die $!; + F->error and confess $!; chomp; return ($_, \%options); } @@ -4028,7 +4028,7 @@ sub pseudomerge_make_commit ($$$$ $$) { # git rev-list --first-parent DTRT. my $pmf = dgit_privdir()."/pseudomerge"; open MC, ">", $pmf or die "$pmf $!"; - print MC <<END or die $!; + print MC <<END or confess $!; tree $tree parent $dgitview parent $archive_hash @@ -4039,7 +4039,7 @@ $msg_msg [$msg_cmd] END - close MC or die $!; + close MC or confess $!; return make_commit($pmf); } @@ -4219,7 +4219,7 @@ sub push_mktags ($$ $$ $) { $dsc->{$ourdscfield[0]} = join " ", $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag}, $reader_giturl; - $dsc->save("$dscfn.tmp") or die $!; + $dsc->save("$dscfn.tmp") or confess $!; my $changes = parsecontrol($changesfile,$changesfilewhat); foreach my $field (qw(Source Distribution Version)) { @@ -4242,8 +4242,8 @@ sub push_mktags ($$ $$ $) { my $head = $tw->{Objid}; my $tag = $tw->{Tag}; - open TO, '>', $tfn->('.tmp') or die $!; - print TO <<END or die $!; + open TO, '>', $tfn->('.tmp') or confess $!; + print TO <<END or confess $!; object $head type commit tag $tag @@ -4254,12 +4254,12 @@ END print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite %s release %s for %s (%s) [dgit] ENDT - or die $!; - print TO <<END or die $!; + or confess $!; + print TO <<END or confess $!; [dgit distro=$declaredistro$delibs] END foreach my $ref (sort keys %previously) { - print TO <<END or die $!; + print TO <<END or confess $!; [dgit previously:$ref=$previously{$ref}] END } @@ -4269,12 +4269,12 @@ END (maintainer view tag generated by dgit --quilt=%s) END $quilt_mode - or die $!; + or confess $!; } else { confess Dumper($tw)."?"; } - close TO or die $!; + close TO or confess $!; my $tagobjfn = $tfn->('.tmp'); if ($sign) { @@ -4284,7 +4284,7 @@ END if (!defined $keyid) { $keyid = getfield $clogp, 'Maintainer'; } - unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!; + unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess $!; my @sign_cmd = (@gpg, qw(--detach-sign --armor)); push @sign_cmd, qw(-u),$keyid if defined $keyid; push @sign_cmd, $tfn->('.tmp'); @@ -4891,11 +4891,11 @@ sub pre_remote_push_build_host { $we_are_responder = 1; $us .= " (build host)"; - open PI, "<&STDIN" or die $!; - open STDIN, "/dev/null" or die $!; - open PO, ">&STDOUT" or die $!; + open PI, "<&STDIN" or confess $!; + open STDIN, "/dev/null" or confess $!; + open PO, ">&STDOUT" or confess $!; autoflush PO 1; - open STDOUT, ">&STDERR" or die $!; + open STDOUT, ">&STDERR" or confess $!; autoflush STDOUT 1; $vsnwant //= 1; @@ -5019,7 +5019,7 @@ sub i_resp_complete { $i_child_pid = undef; # prevents killing some other process with same pid printdebug "waiting for build host child $pid...\n"; my $got = waitpid $pid, 0; - die $! unless $got == $pid; + confess $! unless $got == $pid; fail f_ "build host child failed: %s", waitstatusmsg() if $?; i_cleanup(); @@ -5075,7 +5075,7 @@ sub i_resp_want ($) { foreach my $localpath (@localpaths) { protocol_send_file \*RI, $localpath; } - print RI "files-end\n" or die $!; + print RI "files-end\n" or confess $!; } our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos); @@ -5182,13 +5182,13 @@ sub quiltify_dpkg_commit ($$$;$) { my $descfn = ".git/dgit/quilt-description.tmp"; open O, '>', $descfn or confess "$descfn: $!"; $msg =~ s/\n+/\n\n/; - print O <<END or die $!; + print O <<END or confess $!; From: $author ${xinfo}Subject: $msg --- END - close O or die $!; + close O or confess $!; { local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0; @@ -5370,12 +5370,12 @@ ENDU close GIPATCH or die "$gipatch: $!"; runcmd shell_cmd "exec >>$gipatch", @git, qw(diff), $unapplied, $headref, "--", sort keys %$editedignores; - open SERIES, "+>>", "debian/patches/series" or die $!; - defined seek SERIES, -1, 2 or $!==EINVAL or die $!; + open SERIES, "+>>", "debian/patches/series" or confess $!; + defined seek SERIES, -1, 2 or $!==EINVAL or confess $!; my $newline; - defined read SERIES, $newline, 1 or die $!; - print SERIES "\n" or die $! unless $newline eq "\n"; - print SERIES "auto-gitignore\n" or die $!; + defined read SERIES, $newline, 1 or confess $!; + print SERIES "\n" or confess $! unless $newline eq "\n"; + print SERIES "auto-gitignore\n" or confess $!; close SERIES or die $!; runcmd @git, qw(add -f -- debian/patches/series), $gipatch; commit_admin +(__ <<END).<<ENDU @@ -5741,7 +5741,7 @@ END sub unpack_playtree_mkwork ($) { my ($headref) = @_; - mkdir "work" or die $!; + mkdir "work" or confess $!; changedir "work"; mktree_in_ud_here(); runcmd @git, qw(reset -q --hard), $headref; @@ -5808,8 +5808,8 @@ sub quilt_make_fake_dsc ($) { my $fakeversion="$upstreamversion-~~DGITFAKE"; - my $fakedsc=new IO::File 'fake.dsc', '>' or die $!; - print $fakedsc <<END or die $!; + my $fakedsc=new IO::File 'fake.dsc', '>' or confess $!; + print $fakedsc <<END or confess $!; Format: 3.0 (quilt) Source: $package Version: $fakeversion @@ -5822,11 +5822,11 @@ END my $md = new Digest::MD5; my $fh = new IO::File $b, '<' or die "$b $!"; - stat $fh or die $!; + stat $fh or confess $!; my $size = -s _; $md->addfile($fh); - print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!; + print $fakedsc " ".$md->hexdigest." $size $b\n" or confess $!; }; unpack_playtree_linkorigs($upstreamversion, $dscaddfile); @@ -5843,7 +5843,7 @@ END runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files; $dscaddfile->($debtar); - close $fakedsc or die $!; + close $fakedsc or confess $!; } sub quilt_fakedsc2unapplied ($$) { @@ -6036,7 +6036,7 @@ END progress __ "Tree already contains .pc - will use it then delete it."; $mustdeletepc=1; } else { - rename '../fake/.pc','.pc' or die $!; + rename '../fake/.pc','.pc' or confess $!; } changedir '../fake'; @@ -6116,7 +6116,7 @@ END quiltify($clogp,$headref,$oldtiptree,\@failsuggestion); if (!open P, '>>', ".pc/applied-patches") { - $!==&ENOENT or die $!; + $!==&ENOENT or confess $!; } else { close P; } @@ -6131,25 +6131,25 @@ END sub quilt_fixup_editor () { my $descfn = $ENV{$fakeeditorenv}; my $editing = $ARGV[$#ARGV]; - open I1, '<', $descfn or die "$descfn: $!"; - open I2, '<', $editing or die "$editing: $!"; - unlink $editing or die "$editing: $!"; - open O, '>', $editing or die "$editing: $!"; - while (<I1>) { print O or die $!; } I1->error and die $!; + open I1, '<', $descfn or confess "$descfn: $!"; + open I2, '<', $editing or confess "$editing: $!"; + unlink $editing or confess "$editing: $!"; + open O, '>', $editing or confess "$editing: $!"; + while (<I1>) { print O or confess $!; } I1->error and confess $!; my $copying = 0; while (<I2>) { $copying ||= m/^\-\-\- /; next unless $copying; - print O or die $!; + print O or confess $!; } - I2->error and die $!; + I2->error and confess $!; close O or die $1; finish 0; } sub maybe_apply_patches_dirtily () { return unless $quilt_mode =~ m/gbp|unapplied/; - print STDERR <<END or die $!; + print STDERR <<END or confess $!; dgit: Building, or cleaning with rules target, in patches-unapplied tree. dgit: Have to apply the patches - making the tree dirty. @@ -6194,7 +6194,7 @@ sub clean_tree () { } elsif ($cleanmode eq 'check') { my $leftovers = cmdoutput @git, qw(clean -xdn); if (length $leftovers) { - print STDERR $leftovers, "\n" or die $!; + print STDERR $leftovers, "\n" or confess $!; fail "tree contains uncommitted files and --clean=check specified"; } } elsif ($cleanmode eq 'none') { @@ -6382,7 +6382,7 @@ END } else { fail "wrong number of different changes files (@changesfiles)"; } - printdone "build successful, results in $result\n" or die $!; + printdone "build successful, results in $result\n" or confess $!; } sub midbuild_checkchanges () { @@ -6480,7 +6480,7 @@ sub cmd_gbp_build { if ($gbp_make_orig) { my $priv = dgit_privdir(); my $ok = "$priv/origs-gen-ok"; - unlink $ok or $!==&ENOENT or die $!; + unlink $ok or $!==&ENOENT or confess $!; my @origs_cmd = @cmd; push @origs_cmd, qw(--git-cleaner=true); push @origs_cmd, "--git-prebuild=". @@ -6689,7 +6689,7 @@ sub cmd_print_unapplied_treeish { my $uv = upstreamversion $version; quilt_make_fake_dsc($uv); my $u = quilt_fakedsc2unapplied($headref, $uv); - print $u, "\n" or die $!; + print $u, "\n" or confess $!; } sub import_dsc_result { @@ -6908,7 +6908,7 @@ sub cmd_print_dgit_repos_server_source_url { badusage "no arguments allowed to dgit print-dgit-repos-server-source-url" if @ARGV; my $url = repos_server_url(); - print $url, "\n" or die $!; + print $url, "\n" or confess $!; } sub pre_print_dpkg_source_ignores { @@ -6917,7 +6917,7 @@ sub pre_print_dpkg_source_ignores { sub cmd_print_dpkg_source_ignores { badusage "no arguments allowed to dgit print-dpkg-source-ignores" if @ARGV; - print "@dpkg_source_ignores\n" or die $!; + print "@dpkg_source_ignores\n" or confess $!; } sub cmd_setup_mergechangelogs { @@ -6947,7 +6947,7 @@ sub cmd_setup_new_tree { #---------- argument parsing and main program ---------- sub cmd_version { - print "dgit version $our_version\n" or die $!; + print "dgit version $our_version\n" or confess $!; finish 0; } @@ -7195,7 +7195,7 @@ sub parseopts () { sub check_env_sanity () { my $blocked = new POSIX::SigSet; - sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!; + sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess $!; eval { foreach my $name (qw(PIPE CHLD)) { @@ -7307,7 +7307,7 @@ print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1; print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" if $dryrun_level == 1; if (!@ARGV) { - print STDERR __ $helpmsg or die $!; + print STDERR __ $helpmsg or confess $!; finish 8; } $cmd = $subcommand = shift @ARGV; |