lintian: r312 - trunk/lib

[djpig@debian.org]

Author: djpig
Date: 2004-07-02 16:57:16 +0200 (Fri, 02 Jul 2004)
New Revision: 312

Modified:
   trunk/lib/Util.pm
Log:
Make fail() with $! set work again


Modified: trunk/lib/Util.pm
===================================================================
--- trunk/lib/Util.pm	2004-07-02 13:47:58 UTC (rev 311)
+++ trunk/lib/Util.pm	2004-07-02 14:57:16 UTC (rev 312)
@@ -210,15 +210,17 @@
 # ------------------------
 
 sub fail {
-    $! = 2; # set return code outside eval()
-    if ($_[0]) {
-	die "internal error: $_[0]\n";
+    my $str = "internal error";
+    if (@_) {
+	$str .= ": ".join( "\n", @_)."\n";
     } elsif ($!) {
-	die "internal error: $!\n";
+	$str .= ": $!\n";
     } else {
-	die "internal error.\n";
+	$str .= ".\n";
     }
-    die "$_[1]\n" if $_[1];
+    $! = 2; # set return code outside eval()
+    die $str;
+
 }
 
 1;