From 0ed8fdcdfd2bebdc7f172383b864836581c39123 Mon Sep 17 00:00:00 2001 From: "Michael G. Schwern" Date: Tue, 24 Jul 2012 20:21:10 -0700 Subject: [PATCH] Don't lose Error.pm if $@ gets clobbered. 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 Signed-off-by: Junio C Hamano Signed-off-by: Eric Wong --- perl/Makefile.PL | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 87e1f62ff8..887fa1b22e 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'; } -- 2.11.4.GIT