In perl.git, the branch maint-5.22 has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/34527a0964485e5b84e76074838015e516f41e98?hp=990e80c153251695558491b553d71392aa17ca0d>
- Log -----------------------------------------------------------------
commit 34527a0964485e5b84e76074838015e516f41e98
Author: Steve Hay <steve.m....@googlemail.com>
Date: Wed Oct 12 13:03:20 2016 +0100
Regen customized.dat for base.pm changes again
M t/porting/customized.dat
commit 560e9eed36e28cd67ee5166736bd048f2e6d7a08
Author: Aristotle Pagaltzis <pagalt...@gmx.de>
Date: Wed Oct 12 12:15:06 2016 +0200
revert base.pm incdot test change and fix properly
(cherry picked from commit 72be9a047675de9450eb7a492c222490c1aef5e7)
M dist/base/lib/base.pm
M dist/base/t/incdot.t
-----------------------------------------------------------------------
Summary of changes:
dist/base/lib/base.pm | 3 ++-
dist/base/t/incdot.t | 2 +-
t/porting/customized.dat | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dist/base/lib/base.pm b/dist/base/lib/base.pm
index c919ac1..1b318b6 100644
--- a/dist/base/lib/base.pm
+++ b/dist/base/lib/base.pm
@@ -119,11 +119,12 @@ sub import {
|| $@ =~ /Compilation failed in require at .* line
[0-9]+(?:, <[^>]*> (?:line|chunk) [0-9]+)?\.\n\z/;
unless (%{"$base\::"}) {
require Carp;
+ my @inc = $dotty ? @INC[0..$#INC-1] : @INC;
local $" = " ";
my $e = <<ERROR;
Base class package "$base" is empty.
(Perhaps you need to 'use' the module which defines that package first,
- or make that module available in \@INC (\@INC contains: @INC).
+ or make that module available in \@INC (\@INC contains: @inc).
ERROR
if ($dotty && -e $fn) {
$e .= <<ERROS;
diff --git a/dist/base/t/incdot.t b/dist/base/t/incdot.t
index e0619a6..1619492 100644
--- a/dist/base/t/incdot.t
+++ b/dist/base/t/incdot.t
@@ -8,7 +8,7 @@ use Test::More tests => 2;
if ($INC[-1] ne '.') { push @INC, '.' }
-my $inc = quotemeta "@INC";
+my $inc = quotemeta "@INC[0..$#INC-1]";
eval { 'base'->import("foo") };
like $@, qr/\@INC contains: $inc\).\)/,
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 7990b63..4dbe3b2 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -150,7 +150,7 @@ Win32API::File cpan/Win32API-File/Makefile.PL
605d0aee31aebe84a99408f9ab5f644db5
Win32API::File cpan/Win32API-File/t/file.t
124e64aa77e755235eb297644a87fac5388d3d78
Win32API::File cpan/Win32API-File/t/tie.t
712ea7edd0cc805ce1c0b8172c01b03dd19b583d
Win32API::File cpan/Win32API-File/typemap
24bff088babeadac0873e8df390d1666d9d9db4a
-base dist/base/lib/base.pm 8f00b44549032221308073dc0474cb1fd47be271
+base dist/base/lib/base.pm 9a826b3e75c5efada34381718a05ee0aceb594a3
libnet cpan/libnet/lib/Net/Cmd.pm 4a9f6e4501549a2d7a04fbf5f9e27ab0c00976f2
libnet cpan/libnet/lib/Net/Config.pm dfa96dcd5a459f9f39e5ca513cefc82b8178520f
libnet cpan/libnet/lib/Net/Domain.pm 090c8c06e210102dcf25e6820c6b43b5464ec49a
--
Perl5 Master Repository
