git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael G. Schwern" <schwern@pobox.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: robbat2@gentoo.org, bwalton@artsci.utoronto.ca,
	normalperson@yhbt.net, "Michael G. Schwern" <schwern@pobox.com>
Subject: [PATCH 2/3] Don't lose Error.pm if $@ gets clobbered.
Date: Tue, 24 Jul 2012 20:21:10 -0700	[thread overview]
Message-ID: <1343186471-1024-3-git-send-email-schwern@pobox.com> (raw)
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

  parent reply	other threads:[~2012-07-25  3:21 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-25  3:21 Teach Makefile.PL to find .pm files on its own Michael G. Schwern
2012-07-25  3:21 ` [PATCH 1/3] Quiet warning if Makefile.PL is run with -w and no --localedir Michael G. Schwern
2012-07-25  3:21 ` Michael G. Schwern [this message]
2012-07-25  3:21 ` [PATCH 3/3] The Makefile.PL will now find .pm files itself Michael G. Schwern
2012-07-25 21:11   ` Jonathan Nieder
2012-07-25 21:31     ` Jonathan Nieder
2012-07-25 21:49     ` Michael G Schwern
2012-07-25 21:56       ` Jonathan Nieder
2012-07-25 16:56 ` Teach Makefile.PL to find .pm files on its own Junio C Hamano
2012-07-25 20:26   ` Michael G Schwern
2012-07-25 20:32     ` Junio C Hamano
2012-07-25 21:12       ` Michael G Schwern
2012-07-25 22:19         ` Junio C Hamano
2012-07-25 22:56           ` Michael G Schwern
2012-07-25 23:29             ` Junio C Hamano
2012-07-25 23:37               ` Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1343186471-1024-3-git-send-email-schwern@pobox.com \
    --to=schwern@pobox.com \
    --cc=bwalton@artsci.utoronto.ca \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=normalperson@yhbt.net \
    --cc=robbat2@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).