Don't lose Error.pm if $@ gets clobbered.

schwern · Eric Wong · commit 0ed8fdcdfd2b · 2012-07-27T22:13:27.000Z
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 &lt;schwern@pobox.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git 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';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ my %pm = (`
`41`	`41`
`42`	`42`	`# We come with our own bundled Error.pm. It's not in the set of default`
`43`	`43`	`# Perl modules so install it if it's not available on the system yet.`
`44`		`-eval { require Error };`
`45`		`-if ($@ \|\| $Error::VERSION < 0.15009) {`
	`44`	`+if ( !eval { require Error } \|\| $Error::VERSION < 0.15009) {`
`46`	`45`	`$pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';`
`47`	`46`	`}`
`48`	`47`