зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
4c8e5c55c2
Коммит
0ed8fdcdfd
|
@ -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';
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче