Recheckin due to misapplied patch for bug 123957

diff --git a/checksetup.pl b/checksetup.pl
index d387571b4f09d07e2e6b212df7a56cc269e52afb..c5a00b99f892309e7b0c2b1311689a2c4b457f79 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -322,8 +322,8 @@ print "Checking user setup ...\n";
 $@ = undef;
 if ($ARGV[0]) {
     do $ARGV[0] 
-        or eval die("Error $! processing $ARGV[0]")
-        or die("Error $@ processing $ARGV[0]");
+        or ($@ && die("Error $@ processing $ARGV[0]"))
+        or die("Error $! processing $ARGV[0]");
 }
 do 'localconfig';
 if ($@) { # capture errors in localconfig, bug 97290