summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2011-07-20 23:29:04 +0300
committerVille Skyttä <ville.skytta@iki.fi>2011-07-20 23:29:04 +0300
commit2f8db1963e97a38ad76a18d5acc8ecee0a0657a9 (patch)
tree9d8511a95c6b4a6530370be36239269d7da216c7
parentfde654836bc0f5153eeddfa7944f260e184cafe5 (diff)
downloadvdradmin-am-2f8db1963e97a38ad76a18d5acc8ecee0a0657a9.tar.gz
vdradmin-am-2f8db1963e97a38ad76a18d5acc8ecee0a0657a9.tar.bz2
Improve error messages when Locale::* or IO::Socket::* load fails on startup.
-rw-r--r--HISTORY1
-rwxr-xr-xvdradmind.pl6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 674941a..ef6c5fc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6,6 +6,7 @@ VDR-Portal: amair
201x-xx-xx: x.x.x
- Fixed: --log 0 command line argument (Ville Skyttä).
+- Improved: Startup error messages on module load failures (Ville Skyttä).
2011-06-03: 3.6.8
- Updated: Dutch translation (Submitted by Roel Koelewijn).
diff --git a/vdradmind.pl b/vdradmind.pl
index cc4ee5c..f49d9e9 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -46,7 +46,7 @@ if (eval { require Locale::gettext }) {
} elsif (eval { require Locale::Messages }) {
$localemod = 'Locale::Messages';
} else {
- die("Locale::gettext or Locale::Messages is required!\n");
+ die("Locale::gettext or Locale::Messages is required: $@");
}
my $can_use_bind_textdomain_codeset = 1;
eval {
@@ -439,7 +439,7 @@ if ($UseIPv6) {
$InetSocketModule = 'IO::Socket::INET6';
$VdrSocketModule = 'IO::Socket::INET6' if ($UseIPv6 == 2);
} else {
- die("ERROR: Can't load module IO::Socket::INET6! $!\n");
+ die("ERROR: Can't load module IO::Socket::INET6: $@");
}
}
@@ -570,7 +570,7 @@ if ($UseSSL) {
SSL_ca_path => "$CA_PATH"
);
} else {
- die("ERROR: Can't load module IO::Socket::SSL! $!\n");
+ die("ERROR: Can't load module IO::Socket::SSL: $@");
}
} else {
$Socket = $InetSocketModule->new(Proto => 'tcp',