From e7a12a42d55041acafc1e6012ecb7ad1728f3dee Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Fri, 2 Mar 2007 12:17:33 +0000 Subject: [PATCH] Avoid using Text::Iconv->retval(), which is not in the version on Debian Testing. --- lib/ZOOM/IRSpy/Test/Ping.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm index 5128302..7f14db2 100644 --- a/lib/ZOOM/IRSpy/Test/Ping.pm +++ b/lib/ZOOM/IRSpy/Test/Ping.pm @@ -1,4 +1,4 @@ -# $Id: Ping.pm,v 1.21 2007-03-02 11:56:15 mike Exp $ +# $Id: Ping.pm,v 1.22 2007-03-02 12:17:33 mike Exp $ # See the "Main" test package for documentation @@ -68,8 +68,11 @@ sub maybe_connected { # conversion works, fine; if not, assume it's because the # string was already UTF-8, so use it as is. my $val = $conn->option($opt); - my $maybe = $conv->convert($val); - if (defined $conv->retval() && $maybe ne $val) { + Text::Iconv->raise_error(1); + my $maybe; + eval { + $maybe = $conv->convert($val); + }; if (!$@ && $maybe ne $val) { $conn->log("irspy", "converted '$val' from Latin-1 to UTF-8"); $val = $maybe; } -- 1.7.10.4