r45916 - in /branches/upstream/libcarp-clan-perl/current: Changes MANIFEST META.yml README lib/Carp/Clan.pm

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sat Oct 17 14:08:37 UTC 2009


Author: jawnsy-guest
Date: Sat Oct 17 14:08:30 2009
New Revision: 45916

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45916
Log:
[svn-upgrade] Integrating new upstream version, libcarp-clan-perl (6.02)

Modified:
    branches/upstream/libcarp-clan-perl/current/Changes
    branches/upstream/libcarp-clan-perl/current/MANIFEST
    branches/upstream/libcarp-clan-perl/current/META.yml
    branches/upstream/libcarp-clan-perl/current/README
    branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm

Modified: branches/upstream/libcarp-clan-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/Changes?rev=45916&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/Changes (original)
+++ branches/upstream/libcarp-clan-perl/current/Changes Sat Oct 17 14:08:30 2009
@@ -1,17 +1,22 @@
-		 ====================================
-			 Package "Carp::Clan"
-		 ====================================
+                ============================
+                    Package "Carp::Clan"
+                ============================
 
-             Copyright (c) 2006-2008 by Joshua ben Jore
-			 All rights reserved.
+             Copyright (c) 2006-2009 by Joshua ben Jore
+             All rights reserved.
 
-	     Copyright (c) 2001 - 2004 by Steffen Beyer.
-			 All rights reserved.
-				   
+             Copyright (c) 2001-2009 by Steffen Beyer
+             All rights reserved.
 
 
 Version history:
 ----------------
+
+Version 6.02  17.10.2009
+ + Forgot to fix the bug of duplicated prefixes in _longmsg as well
+
+Version 6.01  16.10.2009
+ + Fixed bug of duplicated prefixes (RT ticket #50560)
 
 Version 6.00  17.02.2008
  + Oops. Fixed version number. '5.10' is less than '5.9'. I thought

Modified: branches/upstream/libcarp-clan-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/MANIFEST?rev=45916&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/MANIFEST (original)
+++ branches/upstream/libcarp-clan-perl/current/MANIFEST Sat Oct 17 14:08:30 2009
@@ -4,10 +4,10 @@
 lib/Carp/Clan.pm
 lib/Carp/Clan.pod
 Makefile.PL
-MANIFEST			This list of files
-META.yml
+MANIFEST
 README
 t/01pod.t
 t/03yaml.t
 t/10basic.t
 t/11basic.t
+META.yml                                 Module meta-data (added by MakeMaker)

Modified: branches/upstream/libcarp-clan-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/META.yml?rev=45916&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/META.yml (original)
+++ branches/upstream/libcarp-clan-perl/current/META.yml Sat Oct 17 14:08:30 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Carp-Clan
-version:             6.00
+version:             6.02
 abstract:            Report errors from perspective of caller of a "clan" of modules
 license:             ~
 author:              

Modified: branches/upstream/libcarp-clan-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/README?rev=45916&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/README (original)
+++ branches/upstream/libcarp-clan-perl/current/README Sat Oct 17 14:08:30 2009
@@ -1,6 +1,13 @@
-		 ====================================
-                       Package "Carp::Clan"
-		 ====================================
+                ============================
+                    Package "Carp::Clan"
+                ============================
+
+             Copyright (c) 2006-2009 by Joshua ben Jore
+             All rights reserved.
+
+             Copyright (c) 2001-2009 by Steffen Beyer
+             All rights reserved.
+
 
 Abstract:
 ---------
@@ -38,7 +45,7 @@
 Changes over previous versions:
 -------------------------------
 
-Please refer to the file "CHANGES.txt" in this distribution for a more
+Please refer to the file "Changes" in this distribution for a more
 detailed version history log.
 
 
@@ -114,19 +121,13 @@
 appear as though they were only one.
 
 
-Author's note:
---------------
+Contact Authors:
+----------------
 
-If you have any questions, suggestions or need any assistance, please
-let me know!
+Joshua ben Jore <jjore at cpan.org>
+http://perlmonks.org/?node=diotalevi
 
-Please do send feedback, this is essential for improving this module
-according to your needs!
+Steffen Beyer <stbey at cpan.org>
+http://www.engelschall.com/u/sb/download/
 
-I hope you will find this module useful. Enjoy!
 
-Yours,
---
-  Steffen Beyer <sb at engelschall.com> http://www.engelschall.com/u/sb/
-  "There is enough for the need of everyone in this world, but not
-   for the greed of everyone." - Mohandas Karamchand "Mahatma" Gandhi

Modified: branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm?rev=45916&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm (original)
+++ branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm Sat Oct 17 14:08:30 2009
@@ -1,7 +1,7 @@
 
 ##
 ## Based on Carp.pm from Perl 5.005_03.
-## Last modified 12-Jun-2001 by Steffen Beyer.
+## Last modified 17-Oct-2009 by Steffen Beyer.
 ## Should be reasonably backwards compatible.
 ##
 ## This module is free software and can
@@ -28,7 +28,7 @@
 
 $Verbose = 0;        # If true then make _shortmsg call _longmsg instead.
 
-$VERSION = '6.00';
+$VERSION = '6.02';
 
 # _longmsg() crawls all the way up the stack reporting on all the function
 # calls made. The error string, $error, is originally constructed from the
@@ -105,8 +105,12 @@
             else              { $msg .= "\t$sub called"; }
         }
         else {
-            if   ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
-            else                  { $msg = "$sub: $error"; }
+            $msg = quotemeta($sub);
+            if ( $error =~ /\b$msg\b/ ) { $msg = $error; }
+            else {
+                if ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
+                else                { $msg = "$sub: $error"; }
+            }
         }
         $msg .= " at $file line $line\n" unless ( $error =~ /\n$/ );
         $error = '';
@@ -134,11 +138,16 @@
     while ( ( $pack, $file, $line, $sub ) = caller( $i++ ) ) {
         next if ( $pack eq 'Carp::Clan' or $pack =~ /$pattern/ );
         if ( $error eq '' ) { $msg = "$sub() called"; }
-        elsif ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
-        else                   { $msg = "$sub: $error"; }
+        else {
+            $msg = quotemeta($sub);
+            if ( $error =~ /\b$msg\b/ ) { $msg = $error; }
+            else {
+                if ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
+                else                { $msg = "$sub: $error"; }
+            }
+        }
         $msg .= " at $file line $line\n" unless ( $error =~ /\n$/ );
-        $msg =~ tr/\0//d
-            ;    # Circumvent die's incorrect handling of NUL characters
+        $msg =~ tr/\0//d; # Circumvent die's incorrect handling of NUL characters
         return $msg;
     }
     goto &_longmsg;




More information about the Pkg-perl-cvs-commits mailing list