X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=Debian%2FDgit.pm;h=979dd427fcf77fc332a14c2272936809f3e6fb7c;hp=aa0c5a3d675cbf1d7418c222a2e5a9f7a6819182;hb=26f2213a36af62d526a41ad96caef7f3c4aa507a;hpb=0658281163715a24c940509ebb8b0a7493e33787

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index aa0c5a3d..979dd427 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -5,10 +5,12 @@ package Debian::Dgit;
 use strict;
 use warnings;
 
+use Carp;
 use POSIX;
 use IO::Handle;
 use Config;
 use Digest::SHA;
+use Data::Dumper;
 
 BEGIN {
     use Exporter   ();
@@ -17,7 +19,7 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(setup_sigwarn
-                      debiantag server_branch server_ref
+                      debiantag_old server_branch server_ref
                       stat_exists link_ltarget
 		      hashfile
                       fail ensuredir executable_on_path
@@ -123,7 +125,7 @@ sub debugcmd {
     printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
-sub debiantag ($$) { 
+sub debiantag_old ($$) { 
     my ($v,$distro) = @_;
     $v =~ y/~:/_%/;
     return "$distro/$v";
@@ -208,7 +210,7 @@ sub failedcmd {
 }
 
 sub cmdoutput_errok {
-    die Dumper(\@_)." ?" if grep { !defined } @_;
+    confess Dumper(\@_)." ?" if grep { !defined } @_;
     debugcmd "|",@_;
     open P, "-|", @_ or die "$_[0] $!";
     my $d;