projects
/
irspy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
795856a
)
Avoid using Text::Iconv->retval(), which is not in the version on Debian Testing.
author
Mike Taylor
<mike@indexdata.com>
Fri, 2 Mar 2007 12:17:33 +0000
(12:17 +0000)
committer
Mike Taylor
<mike@indexdata.com>
Fri, 2 Mar 2007 12:17:33 +0000
(12:17 +0000)
lib/ZOOM/IRSpy/Test/Ping.pm
patch
|
blob
|
history
diff --git
a/lib/ZOOM/IRSpy/Test/Ping.pm
b/lib/ZOOM/IRSpy/Test/Ping.pm
index
5128302
..
7f14db2
100644
(file)
--- 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
# 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);
# 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;
}
$conn->log("irspy", "converted '$val' from Latin-1 to UTF-8");
$val = $maybe;
}