In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/795b0ba929990e79e14ca02b8dc0f1ad7d7282d5?hp=77f7a5f46952c6d0ba0a3c95af769b3b764bf65a>
- Log ----------------------------------------------------------------- commit 795b0ba929990e79e14ca02b8dc0f1ad7d7282d5 Author: Ricardo Signes <[email protected]> Date: Thu Mar 19 19:26:53 2015 -0400 Carp::Heavy is no longer customized M Porting/Maintainers.pl commit 8030c58f67182365290473fa3a3d3a26ac968989 Author: Ricardo Signes <[email protected]> Date: Thu Mar 19 18:59:54 2015 -0400 Carp: remove unneeded VERSION eval, bump version M dist/Carp/lib/Carp.pm M dist/Carp/lib/Carp/Heavy.pm commit a7b5f7a18d777e5893dc505e667c95cb64145ee9 Author: Ricardo Signes <[email protected]> Date: Thu Mar 19 18:59:39 2015 -0400 Carp: avoid hardcoded lines and filenames in test M dist/Carp/t/Carp.t ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 4 +--- dist/Carp/lib/Carp.pm | 2 +- dist/Carp/lib/Carp/Heavy.pm | 2 +- dist/Carp/t/Carp.t | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 433987c..d3e5c33 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -193,10 +193,8 @@ use File::Glob qw(:case); }, 'Carp' => { - 'DISTRIBUTION' => 'RJBS/Carp-1.35.tar.gz', + 'DISTRIBUTION' => 'RJBS/Carp-1.36.tar.gz', 'FILES' => q[dist/Carp], - # Waiting for resolution upstream: CPAN RT#102835 - 'CUSTOMIZED' => [ qw[ lib/Carp/Heavy.pm ] ], }, 'Compress::Raw::Bzip2' => { diff --git a/dist/Carp/lib/Carp.pm b/dist/Carp/lib/Carp.pm index 62aa679..5b191eb 100644 --- a/dist/Carp/lib/Carp.pm +++ b/dist/Carp/lib/Carp.pm @@ -87,7 +87,7 @@ BEGIN { } } -our $VERSION = '1.35'; +our $VERSION = '1.36'; our $MaxEvalLen = 0; our $Verbose = 0; diff --git a/dist/Carp/lib/Carp/Heavy.pm b/dist/Carp/lib/Carp/Heavy.pm index 8863618..a602297 100644 --- a/dist/Carp/lib/Carp/Heavy.pm +++ b/dist/Carp/lib/Carp/Heavy.pm @@ -2,7 +2,7 @@ package Carp::Heavy; use Carp (); -our $VERSION = '1.35'; +our $VERSION = '1.36'; # Carp::Heavy was merged into Carp in version 1.12. Any mismatched versions # after this point are not significant and can be ignored. diff --git a/dist/Carp/t/Carp.t b/dist/Carp/t/Carp.t index b12c482..3d707a1 100644 --- a/dist/Carp/t/Carp.t +++ b/dist/Carp/t/Carp.t @@ -28,10 +28,10 @@ BEGIN { } { - my $str = Carp::longmess("foo"); + my $line = __LINE__; my $str = Carp::longmess("foo"); is( $str, - "foo at t/Carp.t line 31.\n", + "foo at $0 line $line.\n", "we don't overshoot the top stack frame", ); } -- Perl5 Master Repository
