diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2016-12-30 14:50:38 +0000 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2016-12-30 14:50:38 +0000 |
| commit | 37aa3ff35c0e560b5be43acb458043c14c302e4b (patch) | |
| tree | 0f631fee8ac75389c188dea914b2d700213c73fd | |
| parent | 15d9149a6d07d0a16068c287f292b98e24f4d29e (diff) | |
| download | perl-37aa3ff35c0e560b5be43acb458043c14c302e4b.tar.gz | |
Revert "revert base.pm incdot test change and fix properly"
This reverts commit 560e9eed36e28cd67ee5166736bd048f2e6d7a08.
| -rw-r--r-- | dist/base/lib/base.pm | 3 | ||||
| -rw-r--r-- | dist/base/t/incdot.t | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dist/base/lib/base.pm b/dist/base/lib/base.pm index 1b318b6854..c919ac1c73 100644 --- a/dist/base/lib/base.pm +++ b/dist/base/lib/base.pm @@ -119,12 +119,11 @@ 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 1619492250..e0619a6d4c 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[0..$#INC-1]"; +my $inc = quotemeta "@INC"; eval { 'base'->import("foo") }; like $@, qr/\@INC contains: $inc\).\)/, |