|
 |
83b2b9 |
From 582ed99d657fb10750e31e942f88b6ddc0259e01 Mon Sep 17 00:00:00 2001
|
|
|
83b2b9 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
83b2b9 |
Date: Wed, 10 May 2017 16:44:06 +0200
|
|
|
83b2b9 |
Subject: [PATCH] Rebase to 2.18 from perl-5.25.12
|
|
|
83b2b9 |
MIME-Version: 1.0
|
|
|
83b2b9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
83b2b9 |
Content-Transfer-Encoding: 8bit
|
|
|
83b2b9 |
|
|
|
83b2b9 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
83b2b9 |
---
|
|
|
83b2b9 |
lib/CPAN.pm | 2 +-
|
|
|
83b2b9 |
lib/CPAN/Bundle.pm | 7 ++++++-
|
|
|
83b2b9 |
lib/CPAN/Distribution.pm | 8 +++++++-
|
|
|
83b2b9 |
3 files changed, 14 insertions(+), 3 deletions(-)
|
|
|
83b2b9 |
|
|
|
83b2b9 |
diff --git a/lib/CPAN.pm b/lib/CPAN.pm
|
|
|
83b2b9 |
index 1fba5c1..4f02850 100644
|
|
|
83b2b9 |
--- a/lib/CPAN.pm
|
|
|
83b2b9 |
+++ b/lib/CPAN.pm
|
|
|
83b2b9 |
@@ -2,7 +2,7 @@
|
|
|
83b2b9 |
# vim: ts=4 sts=4 sw=4:
|
|
|
83b2b9 |
use strict;
|
|
|
83b2b9 |
package CPAN;
|
|
|
83b2b9 |
-$CPAN::VERSION = '2.16';
|
|
|
83b2b9 |
+$CPAN::VERSION = '2.18';
|
|
|
83b2b9 |
$CPAN::VERSION =~ s/_//;
|
|
|
83b2b9 |
|
|
|
83b2b9 |
# we need to run chdir all over and we would get at wrong libraries
|
|
|
83b2b9 |
diff --git a/lib/CPAN/Bundle.pm b/lib/CPAN/Bundle.pm
|
|
|
83b2b9 |
index 3f17b54..3b4e93d 100644
|
|
|
83b2b9 |
--- a/lib/CPAN/Bundle.pm
|
|
|
83b2b9 |
+++ b/lib/CPAN/Bundle.pm
|
|
|
83b2b9 |
@@ -8,7 +8,7 @@ use CPAN::Module;
|
|
|
83b2b9 |
use vars qw(
|
|
|
83b2b9 |
$VERSION
|
|
|
83b2b9 |
);
|
|
|
83b2b9 |
-$VERSION = "5.5002";
|
|
|
83b2b9 |
+$VERSION = "5.5003";
|
|
|
83b2b9 |
|
|
|
83b2b9 |
sub look {
|
|
|
83b2b9 |
my $self = shift;
|
|
|
83b2b9 |
@@ -21,6 +21,11 @@ sub undelay {
|
|
|
83b2b9 |
delete $self->{later};
|
|
|
83b2b9 |
for my $c ( $self->contains ) {
|
|
|
83b2b9 |
my $obj = CPAN::Shell->expandany($c) or next;
|
|
|
83b2b9 |
+ if ($obj->id eq $self->id){
|
|
|
83b2b9 |
+ my $id = $obj->id;
|
|
|
83b2b9 |
+ $CPAN::Frontend->mywarn("$id seems to contain itself, skipping\n");
|
|
|
83b2b9 |
+ next;
|
|
|
83b2b9 |
+ }
|
|
|
83b2b9 |
$obj->undelay;
|
|
|
83b2b9 |
}
|
|
|
83b2b9 |
}
|
|
|
83b2b9 |
diff --git a/lib/CPAN/Distribution.pm b/lib/CPAN/Distribution.pm
|
|
|
83b2b9 |
index b5744fd..64976eb 100644
|
|
|
83b2b9 |
--- a/lib/CPAN/Distribution.pm
|
|
|
83b2b9 |
+++ b/lib/CPAN/Distribution.pm
|
|
|
83b2b9 |
@@ -8,7 +8,7 @@ use CPAN::InfoObj;
|
|
|
83b2b9 |
use File::Path ();
|
|
|
83b2b9 |
@CPAN::Distribution::ISA = qw(CPAN::InfoObj);
|
|
|
83b2b9 |
use vars qw($VERSION);
|
|
|
83b2b9 |
-$VERSION = "2.16";
|
|
|
83b2b9 |
+$VERSION = "2.18";
|
|
|
83b2b9 |
|
|
|
83b2b9 |
# no prepare, because prepare is not a command on the shell command line
|
|
|
83b2b9 |
# TODO: clear instance cache on reload
|
|
|
83b2b9 |
@@ -377,6 +377,7 @@ sub get {
|
|
|
83b2b9 |
? $ENV{PERL5LIB}
|
|
|
83b2b9 |
: ($ENV{PERLLIB} || "");
|
|
|
83b2b9 |
local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : "";
|
|
|
83b2b9 |
+ # local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # get
|
|
|
83b2b9 |
$CPAN::META->set_perl5lib;
|
|
|
83b2b9 |
local $ENV{MAKEFLAGS}; # protect us from outer make calls
|
|
|
83b2b9 |
|
|
|
83b2b9 |
@@ -1302,6 +1303,7 @@ Could not determine which directory to use for looking at $dist.
|
|
|
83b2b9 |
: ($ENV{PERLLIB} || "");
|
|
|
83b2b9 |
|
|
|
83b2b9 |
local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : "";
|
|
|
83b2b9 |
+ # local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # look
|
|
|
83b2b9 |
$CPAN::META->set_perl5lib;
|
|
|
83b2b9 |
local $ENV{MAKEFLAGS}; # protect us from outer make calls
|
|
|
83b2b9 |
|
|
|
83b2b9 |
@@ -1821,6 +1823,7 @@ sub prepare {
|
|
|
83b2b9 |
? $ENV{PERL5LIB}
|
|
|
83b2b9 |
: ($ENV{PERLLIB} || "");
|
|
|
83b2b9 |
local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : "";
|
|
|
83b2b9 |
+ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # prepare
|
|
|
83b2b9 |
$CPAN::META->set_perl5lib;
|
|
|
83b2b9 |
local $ENV{MAKEFLAGS}; # protect us from outer make calls
|
|
|
83b2b9 |
|
|
|
83b2b9 |
@@ -2115,6 +2118,7 @@ is part of the perl-%s distribution. To install that, you need to run
|
|
|
83b2b9 |
? $ENV{PERL5LIB}
|
|
|
83b2b9 |
: ($ENV{PERLLIB} || "");
|
|
|
83b2b9 |
local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : "";
|
|
|
83b2b9 |
+ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # make
|
|
|
83b2b9 |
$CPAN::META->set_perl5lib;
|
|
|
83b2b9 |
local $ENV{MAKEFLAGS}; # protect us from outer make calls
|
|
|
83b2b9 |
|
|
|
83b2b9 |
@@ -3482,6 +3486,7 @@ sub test {
|
|
|
83b2b9 |
: ($ENV{PERLLIB} || "");
|
|
|
83b2b9 |
|
|
|
83b2b9 |
local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : "";
|
|
|
83b2b9 |
+ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # test
|
|
|
83b2b9 |
$CPAN::META->set_perl5lib;
|
|
|
83b2b9 |
local $ENV{MAKEFLAGS}; # protect us from outer make calls
|
|
|
83b2b9 |
local $ENV{PERL_MM_USE_DEFAULT} = 1 if $CPAN::Config->{use_prompt_default};
|
|
|
83b2b9 |
@@ -3955,6 +3960,7 @@ sub install {
|
|
|
83b2b9 |
: ($ENV{PERLLIB} || "");
|
|
|
83b2b9 |
|
|
|
83b2b9 |
local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : "";
|
|
|
83b2b9 |
+ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # install
|
|
|
83b2b9 |
$CPAN::META->set_perl5lib;
|
|
|
83b2b9 |
local $ENV{PERL_MM_USE_DEFAULT} = 1 if $CPAN::Config->{use_prompt_default};
|
|
|
83b2b9 |
local $ENV{NONINTERACTIVE_TESTING} = 1 if $CPAN::Config->{use_prompt_default};
|
|
|
83b2b9 |
--
|
|
|
83b2b9 |
2.9.3
|
|
|
83b2b9 |
|