From e69d3eabc883c27e303f58dd6f94472e7850243d Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 23 Aug 2015 10:53:09 +0200 Subject: dh_elpa: replace 'die' with 'error' This produces more standard looking messages --- dh_elpa | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dh_elpa b/dh_elpa index 9d7abbe..b62050d 100755 --- a/dh_elpa +++ b/dh_elpa @@ -57,8 +57,8 @@ sub doit_quietly { my $exitcode; verbose_print(escape_shell(@_)); - open (CPERR,">&STDERR") or die "$!"; - open (CPOUT,">&STDOUT") or die "$!"; + open (CPERR,">&STDERR") or error "$!"; + open (CPOUT,">&STDOUT") or error "$!"; STDOUT->fdopen($handle,'w'); STDERR->fdopen($handle,'w'); my $ret=doit_noerror(@_); @@ -67,7 +67,7 @@ sub doit_quietly { if (!$ret){ $exitcode=$?; - seek $handle, 0, 0 or die "$!"; + seek $handle, 0, 0 or error "$!"; print while (<$handle>); my $command=join(" ",@_); error("$command returned exit code ".($exitcode >> 8)); @@ -153,17 +153,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) { { require File::Path; File::Path::rmtree $tempdir || - die "cleaning $tempdir"; + error "cleaning $tempdir"; File::Path::make_path $tempdir || - die "creating $tempdir"; + error "creating $tempdir"; } - my $version = $dh{VERSION} or die "version not found!"; + my $version = $dh{VERSION} or error "version not found!"; $version =~ s/-[^-]+//; # strip Debian version my $pkg_dir = "$elpapkg-$version"; $pkg_file = "$tempdir/$pkg_dir.tar"; - mkdir "$tempdir/$pkg_dir" or die "$!"; + mkdir "$tempdir/$pkg_dir" or error "$!"; # copy files into tempdir, flattening hierarchy # TODO: do this more correctly -- cgit v1.2.3