r46092 - in /branches/upstream/libcarp-clan-perl/current: Changes META.yml Makefile.PL README lib/Carp/Clan.pm t/11basic.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Oct 19 16:48:15 UTC 2009
Author: jawnsy-guest
Date: Mon Oct 19 16:48:08 2009
New Revision: 46092
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46092
Log:
[svn-upgrade] Integrating new upstream version, libcarp-clan-perl (6.03)
Modified:
branches/upstream/libcarp-clan-perl/current/Changes
branches/upstream/libcarp-clan-perl/current/META.yml
branches/upstream/libcarp-clan-perl/current/Makefile.PL
branches/upstream/libcarp-clan-perl/current/README
branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm
branches/upstream/libcarp-clan-perl/current/t/11basic.t
Modified: branches/upstream/libcarp-clan-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/Changes?rev=46092&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/Changes (original)
+++ branches/upstream/libcarp-clan-perl/current/Changes Mon Oct 19 16:48:08 2009
@@ -11,6 +11,10 @@
Version history:
----------------
+
+Version 6.03 18.10.2009
+ + Re-release to resolve confusion in CPAN caused by intermediate release
+ of Carp::Clan 5.4 (backport of bugfix #50560 below for Perls < v5.6.0)
Version 6.02 17.10.2009
+ Forgot to fix the bug of duplicated prefixes in _longmsg as well
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=46092&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/META.yml (original)
+++ branches/upstream/libcarp-clan-perl/current/META.yml Mon Oct 19 16:48:08 2009
@@ -1,10 +1,10 @@
--- #YAML:1.0
name: Carp-Clan
-version: 6.02
+version: 6.03
abstract: Report errors from perspective of caller of a "clan" of modules
license: ~
author:
- - Joshua ben Jore <jjore at cpan.org>
+ - Steffen Beyer <STBEY at cpan.org>
generated_by: ExtUtils::MakeMaker version 6.42
distribution_type: module
requires:
Modified: branches/upstream/libcarp-clan-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/Makefile.PL?rev=46092&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/Makefile.PL (original)
+++ branches/upstream/libcarp-clan-perl/current/Makefile.PL Mon Oct 19 16:48:08 2009
@@ -3,16 +3,15 @@
use strict;
use ExtUtils::MakeMaker;
-my %PREREQ_PM = (
- 'Test::Exception' => 0,
- );
-
WriteMakefile(
NAME => 'Carp::Clan',
- AUTHOR => 'Joshua ben Jore <jjore at cpan.org>',
+ AUTHOR => 'Steffen Beyer <STBEY at cpan.org>',
VERSION_FROM => 'lib/Carp/Clan.pm',
ABSTRACT_FROM => 'lib/Carp/Clan.pod',
- PREREQ_PM => \ % PREREQ_PM,
- dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
- clean => { FILES => 'Carp-Clan-*', },
+ PREREQ_PM => { 'Test::Exception' => 0 },
+ dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz' },
+ clean => { FILES => 'Carp-Clan-*' }
);
+
+__END__
+
Modified: branches/upstream/libcarp-clan-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/README?rev=46092&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/README (original)
+++ branches/upstream/libcarp-clan-perl/current/README Mon Oct 19 16:48:08 2009
@@ -21,6 +21,14 @@
So these modules stick together like a "clan" and any error which
occurs will be blamed on the "outsider" script or modules not belonging
to this "clan".
+
+
+What's new in this release:
+---------------------------
+
+Version 6.03 18.10.2009
+ + Re-release to resolve confusion in CPAN caused by intermediate release
+ of Carp::Clan 5.4 (backport of bugfix #50560 below for Perls < v5.6.0)
Prerequisites:
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=46092&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm (original)
+++ branches/upstream/libcarp-clan-perl/current/lib/Carp/Clan.pm Mon Oct 19 16:48:08 2009
@@ -28,7 +28,7 @@
$Verbose = 0; # If true then make _shortmsg call _longmsg instead.
-$VERSION = '6.02';
+$VERSION = '6.03';
# _longmsg() crawls all the way up the stack reporting on all the function
# calls made. The error string, $error, is originally constructed from the
@@ -153,6 +153,10 @@
goto &_longmsg;
}
+# In the two identical regular expressions (immediately after the two occurrences of
+# "quotemeta") above, the "\b ... \b" helps to avoid confusion between function names
+# which are prefixes of each other, e.g. "My::Class::print" and "My::Class::println".
+
# The following four functions call _longmsg() or _shortmsg() depending on
# whether they should generate a full stack trace (confess() and cluck())
# or simply report the caller's package (croak() and carp()), respectively.
@@ -218,12 +222,10 @@
{
local ($^W) = 0;
no strict "refs";
- *{"${callpkg}::croak"}
- = sub { die _shortmsg( $pattern, $verbose, @_ ); };
- *{"${callpkg}::confess"} = sub { die _longmsg(@_); };
- *{"${callpkg}::carp"}
- = sub { warn _shortmsg( $pattern, $verbose, @_ ); };
- *{"${callpkg}::cluck"} = sub { warn _longmsg(@_); };
+ *{"${callpkg}::croak"} = sub { die _shortmsg( $pattern, $verbose, @_ ); };
+ *{"${callpkg}::confess"} = sub { die _longmsg ( @_ ); };
+ *{"${callpkg}::carp"} = sub { warn _shortmsg( $pattern, $verbose, @_ ); };
+ *{"${callpkg}::cluck"} = sub { warn _longmsg ( @_ ); };
}
}
Modified: branches/upstream/libcarp-clan-perl/current/t/11basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcarp-clan-perl/current/t/11basic.t?rev=46092&op=diff
==============================================================================
--- branches/upstream/libcarp-clan-perl/current/t/11basic.t (original)
+++ branches/upstream/libcarp-clan-perl/current/t/11basic.t Mon Oct 19 16:48:08 2009
@@ -35,7 +35,7 @@
my $n = 1;
-# If a person' environment predefined carp/croak/confess/cluck then I
+# If a person's environment predefined carp/croak/confess/cluck then I
# need to know to ignore whether it was properly imported and just
# trust that I have something that works.
my %skip_import_tests;
@@ -86,8 +86,8 @@
++$n;
}
-# Create a heirarchy of packages to create a call stack. A( B( C( D(
-# E( F( carp/croak/cluck/confess ))))))
+# Create a hierarchy of packages to create a call stack:
+# A( B( C( D( E( F( carp/croak/cluck/confess ))))))
package A;
sub a { B::b(@_); }
More information about the Pkg-perl-cvs-commits
mailing list