diff options
| author |  Michael G. Schwern <schwern@pobox.com> | 2012-07-24 20:21:10 -0700 |
|---|---|---|
| committer |  Eric Wong <normalperson@yhbt.net> | 2012-07-27 22:13:27 +0000 |
| commit | 0ed8fdcdfd2bebdc7f172383b864836581c39123 (patch) | |
| tree | dc02eb422fbc1b675f11a5d0b91097beb28e3c7a /perl | |
| parent | Quiet warning if Makefile.PL is run with -w and no --localedir (diff) | |
| download | tgif-0ed8fdcdfd2bebdc7f172383b864836581c39123.tar.xz | |
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 <schwern@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/Makefile.PL | 3 |
1 files changed, 1 insertions, 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'; } |