diff options
author | Steve Hay <steve.m.hay@googlemail.com> | 2016-12-30 14:51:20 +0000 |
---|---|---|
committer | Steve Hay <steve.m.hay@googlemail.com> | 2016-12-30 14:51:20 +0000 |
commit | f28f33d13cfd976835e96be0f51c8952822309b7 (patch) | |
tree | f58221c1aa0f7f45c16d3354ee8991ed592cd411 | |
parent | e28961db8c9539b25a01ac91a2255ca7da9f7abf (diff) | |
download | perl-f28f33d13cfd976835e96be0f51c8952822309b7.tar.gz |
Revert "[perl #128769] Improve base.pm @INC . message"
This reverts commit 6bcd39a65fd349de4dea14c3ff0ab91203000105.
-rw-r--r-- | dist/base/lib/base.pm | 9 | ||||
-rw-r--r-- | dist/base/t/incdot.t | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/dist/base/lib/base.pm b/dist/base/lib/base.pm index 1aa814bff9..8be63f69e1 100644 --- a/dist/base/lib/base.pm +++ b/dist/base/lib/base.pm @@ -121,13 +121,8 @@ Base class package "$base" is empty. ERROR if ($dotty && -e $fn) { $e .= <<ERROS; - The file $fn does exist in the current directory. But note - that base.pm, when loading a module, now ignores the current working - directory if it is the last entry in \@INC. If your software worked on - previous versions of Perl, the best solution is to use FindBin to - detect the path properly and to add that path to \@INC. As a last - resort, you can re-enable looking in the current working directory by - adding "use lib '.'" to your code. + If you mean to load $fn from the current directory, you may + want to try "use lib '.'". ERROS } $e =~ s/\n\z/)\n/; diff --git a/dist/base/t/incdot.t b/dist/base/t/incdot.t index 1619492250..fadebc4a45 100644 --- a/dist/base/t/incdot.t +++ b/dist/base/t/incdot.t @@ -15,5 +15,5 @@ like $@, qr/\@INC contains: $inc\).\)/, 'Error does not list final dot in @INC (or mention use lib)'; eval { 'base'->import('t::lib::Dummy') }; like $@, qr<\@INC contains: $inc\).\n(?x: - ) The file t/lib/Dummy\.pm does exist in the current direct>, + ) If you mean to load t/lib/Dummy\.pm from the current >, 'special cur dir message for existing files in . that are ignored'; |