summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2015-08-23 10:53:09 +0200
committerDavid Bremner <david@tethera.net>2015-08-23 10:53:09 +0200
commite69d3eabc883c27e303f58dd6f94472e7850243d (patch)
tree04543b906d1ceea8b320c3e27b3eda08fa9c0b77
parentab4ddd3a525a5f0b7f327c7c9e4d97c040e990d8 (diff)
dh_elpa: replace 'die' with 'error'
This produces more standard looking messages
-rwxr-xr-xdh_elpa14
1 files 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