diff options
| author | David Mitchell <davem@iabyn.com> | 2017-04-16 21:04:01 +0100 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2017-04-16 21:04:01 +0100 |
| commit | 755cc9a5df44deae0c5b0edd809d1146d1ef9efe (patch) | |
| tree | 79c4ee12d60ecf99032a968c2e26eb5760fd570c /cpan | |
| parent | ab1d79fc5ab7e0b46b4fd02752a334c2a5c93ace (diff) | |
| download | perl-755cc9a5df44deae0c5b0edd809d1146d1ef9efe.tar.gz | |
Update CPAN.pm to ANDK/CPAN-2.18-TRIAL.tar.gz
RT #131141
CPAN-2.17-TRIAL tried to narrow the scope to the phases prepare, make,
and test, but after some testing evidence took shape that
PERL_USE_UNSAFE_INC=1 is also needed for the install phase.
2.18 provides this change. The second issue fixed in 2.18 addresses
RT #120781, an ugly bug with a trivial fix.
Diffstat (limited to 'cpan')
| -rw-r--r-- | cpan/CPAN/lib/CPAN.pm | 2 | ||||
| -rw-r--r-- | cpan/CPAN/lib/CPAN/Bundle.pm | 7 | ||||
| -rw-r--r-- | cpan/CPAN/lib/CPAN/Distribution.pm | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm index 185ade9095..4f028505f8 100644 --- a/cpan/CPAN/lib/CPAN.pm +++ b/cpan/CPAN/lib/CPAN.pm @@ -2,7 +2,7 @@ # vim: ts=4 sts=4 sw=4: use strict; package CPAN; -$CPAN::VERSION = '2.17'; +$CPAN::VERSION = '2.18'; $CPAN::VERSION =~ s/_//; # we need to run chdir all over and we would get at wrong libraries diff --git a/cpan/CPAN/lib/CPAN/Bundle.pm b/cpan/CPAN/lib/CPAN/Bundle.pm index 3f17b540dd..3b4e93d8bf 100644 --- a/cpan/CPAN/lib/CPAN/Bundle.pm +++ b/cpan/CPAN/lib/CPAN/Bundle.pm @@ -8,7 +8,7 @@ use CPAN::Module; use vars qw( $VERSION ); -$VERSION = "5.5002"; +$VERSION = "5.5003"; sub look { my $self = shift; @@ -21,6 +21,11 @@ sub undelay { delete $self->{later}; for my $c ( $self->contains ) { my $obj = CPAN::Shell->expandany($c) or next; + if ($obj->id eq $self->id){ + my $id = $obj->id; + $CPAN::Frontend->mywarn("$id seems to contain itself, skipping\n"); + next; + } $obj->undelay; } } diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm index fc7ce10f7b..64976eb7bb 100644 --- a/cpan/CPAN/lib/CPAN/Distribution.pm +++ b/cpan/CPAN/lib/CPAN/Distribution.pm @@ -8,7 +8,7 @@ use CPAN::InfoObj; use File::Path (); @CPAN::Distribution::ISA = qw(CPAN::InfoObj); use vars qw($VERSION); -$VERSION = "2.17"; +$VERSION = "2.18"; # no prepare, because prepare is not a command on the shell command line # TODO: clear instance cache on reload @@ -3960,7 +3960,7 @@ sub install { : ($ENV{PERLLIB} || ""); local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : ""; - # local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # install + local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # install $CPAN::META->set_perl5lib; local $ENV{PERL_MM_USE_DEFAULT} = 1 if $CPAN::Config->{use_prompt_default}; local $ENV{NONINTERACTIVE_TESTING} = 1 if $CPAN::Config->{use_prompt_default}; |