In perl.git, the branch maint-5.24 has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/91fdb36ec4a24fb3d43cb8f7467d836fe2c894da?hp=30222baf8c8b4c9785e63829370d1220e1d1a09f>
- Log -----------------------------------------------------------------
commit 91fdb36ec4a24fb3d43cb8f7467d836fe2c894da
Author: Steve Hay <steve.m....@googlemail.com>
Date: Wed Oct 12 13:03:35 2016 +0100
Regen customized.dat for base.pm changes again
M t/porting/customized.dat
commit b6bff9ec019a98880c6310e7132439eccd24b72b
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 d7193a6..40c1ffd 100644
--- a/dist/base/lib/base.pm
+++ b/dist/base/lib/base.pm
@@ -120,11 +120,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 4c62386..6b6bbbd 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -159,7 +159,7 @@ Test::Harness
cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm 76771092dd2b87a
Test::Harness cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm
bf1fbfff9720330886651f183959a5db56daeea0
Test::Harness cpan/Test-Harness/lib/Test/Harness.pm
da2d76ba673372da129060c9d0adb8cf0d91f9f7
autodie cpan/autodie/t/mkdir.t 9e70d2282a3cc7d76a78bf8144fccba20fb37dac
-base dist/base/lib/base.pm b65c508c9d699bf2b7913fb17dc9b23d4c508b33
+base dist/base/lib/base.pm 8db115a702f759526b031f90cc572d97086978a6
bignum cpan/bignum/lib/bigint.pm 56330354995409dab5073ea92d749f8727e265db
bignum cpan/bignum/lib/bignum.pm e999973f78e6be12282c11bb6328246b31a9576b
bignum cpan/bignum/lib/bigrat.pm 7fccc9df30e43dbbae6e5ea91b26c8046545c9a9
--
Perl5 Master Repository
