[PATCH 2/3] Don't lose Error.pm if $@ gets clobbered.

From: Michael G. Schwern <schwern@pobox.com>
Date: Jul 25, 2012, 03:21 UTC
Message-ID: <1343186471-1024-3-git-send-email-schwern@pobox.com>
In-Reply-To: <1343186471-1024-1-git-send-email-schwern@pobox.com>

From: "Michael G. Schwern" <schwern@pobox.com>

In older Perls, sometimes $@ can become unset between the eval and checking $@. Its safer to check the eval directly.

Signed-off-by: Michael G Schwern <schwern@pobox.com>
---
 perl/Makefile.PL | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 87e1f62..887fa1b 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -41,8 +41,7 @@ my %pm = (
 
 # We come with our own bundled Error.pm. It's not in the set of default
 # Perl modules so install it if it's not available on the system yet.
-eval { require Error };
-if ($@ || $Error::VERSION < 0.15009) {
+if ( !eval { require Error } || $Error::VERSION < 0.15009) {
 	$pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';
 }

-- 
1.7.11.1