Change 17806 by [EMAIL PROTECTED] on 2002/08/29 22:56:45
#17449 failed to apply the actual patch. This is it.
Affected files ...
.... //depot/perl/lib/Exporter.pm#29 edit
.... //depot/perl/lib/Exporter/Heavy.pm#19 edit
Differences ...
==== //depot/perl/lib/Exporter.pm#29 (text) ====
Index: perl/lib/Exporter.pm
--- perl/lib/Exporter.pm#28~17749~ Wed Aug 21 18:04:32 2002
+++ perl/lib/Exporter.pm Thu Aug 29 15:56:45 2002
@@ -9,7 +9,8 @@
our $Debug = 0;
our $ExportLevel = 0;
our $Verbose ||= 0;
-our $VERSION = '5.566';
+our $VERSION = '5.567';
+our (%Cache);
$Carp::Internal{Exporter} = 1;
sub as_heavy {
@@ -30,10 +31,10 @@
my $callpkg = caller($ExportLevel);
# We *need* to treat @{"$pkg\::EXPORT_FAIL"} since Carp uses it :-(
- my($exports, $export_cache, $fail)
- = (\@{"$pkg\::EXPORT"}, \%{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
+ my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
return export $pkg, $callpkg, @_
if $Verbose or $Debug or @$fail > 1;
+ my $export_cache = ($Cache{$pkg} ||= {});
my $args = @_ or @_ = @$exports;
local $_;
==== //depot/perl/lib/Exporter/Heavy.pm#19 (text) ====
Index: perl/lib/Exporter/Heavy.pm
--- perl/lib/Exporter/Heavy.pm#18~17749~ Wed Aug 21 18:04:32 2002
+++ perl/lib/Exporter/Heavy.pm Thu Aug 29 15:56:45 2002
@@ -51,7 +51,7 @@
my($pkg, $callpkg, @imports) = @_;
my($type, $sym, $oops);
my($exports, $export_cache) = (\@{"${pkg}::EXPORT"},
- \%{"${pkg}::EXPORT"});
+ $Exporter::Cache{$pkg} ||= {});
if (@imports) {
if (!%$export_cache) {
@@ -144,7 +144,7 @@
}
my($fail, $fail_cache) = (\@{"${pkg}::EXPORT_FAIL"},
- \%{"${pkg}::EXPORT_FAIL"});
+ $Exporter::FailCache{$pkg} ||= {});
if (@$fail) {
if (!%$fail_cache) {
End of Patch.
