Fix for Exporter error reporting behaviour

Message-ID: <3C0D1B9A@operamail.com>

p4raw-id: //depot/perl@13406

diff --git a/lib/Exporter.pm b/lib/Exporter.pm
index ce89c59..9088a31 100644 (file)
--- a/lib/Exporter.pm
+++ b/lib/Exporter.pm
@@ -8,7 +8,8 @@ no strict 'refs';
 our $Debug = 0;
 our $ExportLevel = 0;
 our $Verbose ||= 0;
-our $VERSION = '5.563';
+our $VERSION = '5.564';
+$Carp::Internal{Exporter} = 1;
 
 sub export_to_level {
   require Exporter::Heavy;
@@ -56,7 +57,7 @@ sub import {
     return export $pkg, $callpkg, ($args ? @_ : ());
   }
   local $SIG{__WARN__} = 
-       sub {require Carp; local $Carp::CarpLevel = 1; &Carp::carp};
+       sub {require Carp; &Carp::carp};
   foreach my $sym (@_) {
     # shortcut for the common case of no type character
     *{"$callpkg\::$sym"} = \&{"$pkg\::$sym"};

diff --git a/lib/Exporter/Heavy.pm b/lib/Exporter/Heavy.pm
index 4b1c2e2..abdae6c 100644 (file)
--- a/lib/Exporter/Heavy.pm
+++ b/lib/Exporter/Heavy.pm
@@ -5,7 +5,7 @@ no strict 'refs';
 
 # On one line so MakeMaker will see it.
 require Exporter;  our $VERSION = $Exporter::VERSION;
-
+$Carp::Internal{"Exporter::Heavy"} = 1;
 our $Verbose;
 
 =head1 NAME