78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
|
From 7b5bfc02532e5a275fadc43beb1d7f9a0ef3fdb8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jitka Plesnikova <jplesnik@redhat.com>
|
||
|
|
Date: Tue, 16 May 2023 12:41:10 +0200
|
||
|
|
Subject: [PATCH] Upgrade to 1.54
|
||
|
|
|
||
|
|
---
|
||
|
|
lib/Carp.pm | 12 ++++++------
|
||
|
|
lib/Carp/Heavy.pm | 2 +-
|
||
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/Carp.pm b/lib/Carp.pm
|
||
|
|
index df563d0..20b9708 100644
|
||
|
|
--- a/lib/Carp.pm
|
||
|
|
+++ b/lib/Carp.pm
|
||
|
|
@@ -179,7 +179,7 @@ BEGIN {
|
||
|
|
? do { require "overload.pm"; _fetch_sub overload => 'mycan' }
|
||
|
|
: \&UNIVERSAL::can;
|
||
|
|
|
||
|
|
- # _blessed is either UNIVERAL::isa(...), or, in the presence of an
|
||
|
|
+ # _blessed is either UNIVERSAL::isa(...), or, in the presence of an
|
||
|
|
# override, a hideous, but fairly reliable, workaround.
|
||
|
|
*_blessed = $isa
|
||
|
|
? sub { &$isa($_[0], "UNIVERSAL") }
|
||
|
|
@@ -211,7 +211,7 @@ BEGIN {
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
-our $VERSION = '1.52';
|
||
|
|
+our $VERSION = '1.54';
|
||
|
|
$VERSION =~ tr/_//d;
|
||
|
|
|
||
|
|
our $MaxEvalLen = 0;
|
||
|
|
@@ -776,8 +776,8 @@ Carp - alternative warn and die for modules
|
||
|
|
# cluck, longmess and shortmess not exported by default
|
||
|
|
use Carp qw(cluck longmess shortmess);
|
||
|
|
cluck "This is how we got here!"; # warn with stack backtrace
|
||
|
|
- $long_message = longmess( "message from cluck() or confess()" );
|
||
|
|
- $short_message = shortmess( "message from carp() or croak()" );
|
||
|
|
+ my $long_message = longmess( "message from cluck() or confess()" );
|
||
|
|
+ my $short_message = shortmess( "message from carp() or croak()" );
|
||
|
|
|
||
|
|
=head1 DESCRIPTION
|
||
|
|
|
||
|
|
@@ -802,7 +802,7 @@ Of course, C<Carp> can't guarantee the latter.
|
||
|
|
|
||
|
|
You can also alter the way the output and logic of C<Carp> works, by
|
||
|
|
changing some global variables in the C<Carp> namespace. See the
|
||
|
|
-section on C<GLOBAL VARIABLES> below.
|
||
|
|
+section on L</GLOBAL VARIABLES> below.
|
||
|
|
|
||
|
|
Here is a more complete description of how C<carp> and C<croak> work.
|
||
|
|
What they do is search the call-stack for a function call stack where
|
||
|
|
@@ -868,7 +868,7 @@ or by including the string C<-MCarp=verbose> in the PERL5OPT
|
||
|
|
environment variable.
|
||
|
|
|
||
|
|
Alternately, you can set the global variable C<$Carp::Verbose> to true.
|
||
|
|
-See the C<GLOBAL VARIABLES> section below.
|
||
|
|
+See the L</GLOBAL VARIABLES> section below.
|
||
|
|
|
||
|
|
=head2 Stack Trace formatting
|
||
|
|
|
||
|
|
diff --git a/lib/Carp/Heavy.pm b/lib/Carp/Heavy.pm
|
||
|
|
index fdb3e52..043e345 100644
|
||
|
|
--- a/lib/Carp/Heavy.pm
|
||
|
|
+++ b/lib/Carp/Heavy.pm
|
||
|
|
@@ -2,7 +2,7 @@ package Carp::Heavy;
|
||
|
|
|
||
|
|
use Carp ();
|
||
|
|
|
||
|
|
-our $VERSION = '1.52';
|
||
|
|
+our $VERSION = '1.54';
|
||
|
|
$VERSION =~ tr/_//d;
|
||
|
|
|
||
|
|
# Carp::Heavy was merged into Carp in version 1.12. Any mismatched versions
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|