In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2c34ec1b60eadacbf29fae442ed08c82ee42863b?hp=2c25177bbcb0217f887201e4237280b5033145b6>
- Log ----------------------------------------------------------------- commit 2c34ec1b60eadacbf29fae442ed08c82ee42863b Author: Chris 'BinGOs' Williams <[email protected]> Date: Fri Jul 29 13:10:36 2016 +0100 Update Module-Load-Conditional to CPAN version 0.68 [DELTA] 0.68 Fri Jul 29 08:01:12 BST 2016 * Fix unconditional @INC localisation ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- .../Module-Load-Conditional/lib/Module/Load/Conditional.pm | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 9cbce9f..66c630a 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -929,7 +929,7 @@ use File::Glob qw(:case); }, 'Module::Load::Conditional' => { - 'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.66.tar.gz', + 'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.68.tar.gz', 'FILES' => q[cpan/Module-Load-Conditional], }, diff --git a/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm b/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm index 592bfbb..89e22b5 100644 --- a/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm +++ b/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm @@ -22,7 +22,7 @@ BEGIN { $FIND_VERSION $ERROR $CHECK_INC_HASH $FORCE_SAFE_INC ]; use Exporter; @ISA = qw[Exporter]; - $VERSION = '0.66'; + $VERSION = '0.68'; $VERBOSE = 0; $DEPRECATED = 0; $FIND_VERSION = 1; @@ -202,8 +202,7 @@ sub check_install { ### so scan the dirs unless( $filename ) { - local @INC = @INC; - pop @INC if $FORCE_SAFE_INC && $INC[-1] eq '.'; + local @INC = @INC[0..$#INC-1] if $FORCE_SAFE_INC && $INC[-1] eq '.'; DIR: for my $dir ( @INC ) { @@ -311,8 +310,7 @@ sub check_install { } if ( $DEPRECATED and "$]" >= 5.011 ) { - local @INC = @INC; - pop @INC if $INC[-1] eq '.'; + local @INC = @INC[0..$#INC-1] if $FORCE_SAFE_INC && $INC[-1] eq '.'; require Module::CoreList; require Config; @@ -450,8 +448,7 @@ sub can_load { if ( $CACHE->{$mod}->{uptodate} ) { - local @INC = @INC; - pop @INC if $FORCE_SAFE_INC && $INC[-1] eq '.'; + local @INC = @INC[0..$#INC-1] if $FORCE_SAFE_INC && $INC[-1] eq '.'; if ( $args->{autoload} ) { my $who = (caller())[0]; @@ -518,8 +515,7 @@ sub requires { return undef; } - local @INC = @INC; - pop @INC if $FORCE_SAFE_INC && $INC[-1] eq '.'; + local @INC = @INC[0..$#INC-1] if $FORCE_SAFE_INC && $INC[-1] eq '.'; my $lib = join " ", map { qq["-I$_"] } @INC; my $oneliner = 'print(join(qq[\n],map{qq[BONG=$_]}keys(%INC)),qq[\n])'; -- Perl5 Master Repository
