summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-12-19 21:34:59 +0000
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-12-19 21:34:59 +0000
commitdb3e41d4b271fe793325534dbd8abf58985bdcdd (patch)
treebddc918ae3ae00da36505222089fd62072181b56 /cpan
parentc39582794cc912e09da947a19dd28a00d770d75c (diff)
downloadperl-db3e41d4b271fe793325534dbd8abf58985bdcdd.tar.gz
Update CPANPLUS to CPAN version 0.9114
[DELTA] Changes for 0.9114 Mon Dec 19 21:15:38 2011 ================================================ * Fail earlier on unresolvable prereqs as per [rt.cpan.org #73310]
Diffstat (limited to 'cpan')
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Dist.pm4
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Internals.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm2
4 files changed, 6 insertions, 4 deletions
diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index 6e2ae0c12f..5bea8c3ed6 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS.pm
@@ -13,7 +13,7 @@ BEGIN {
use vars qw( @EXPORT @ISA $VERSION );
@EXPORT = qw( shell fetch get install );
@ISA = qw( Exporter );
- $VERSION = "0.9113"; #have to hardcode or cpan.org gets unhappy
+ $VERSION = "0.9114"; #have to hardcode or cpan.org gets unhappy
}
### purely for backward compatibility, so we can call it from the commandline:
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm
index 9b85f29445..22af8463df 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm
@@ -600,6 +600,8 @@ sub _resolve_prereqs {
### list of module objects + desired versions
my @install_me;
+ my $flag;
+
for my $mod ( @sorted_prereqs ) {
( my $version = $prereqs->{$mod} ) =~ s#[^0-9\._]+##g;
@@ -632,6 +634,7 @@ sub _resolve_prereqs {
my $core = $sub->( $mod );
unless ( defined $core ) {
error( loc( "No such module '%1' found on CPAN", $mod ) );
+ $flag++;
next;
}
if ( $cb->_vcmp( $version, $core ) > 0 ) {
@@ -690,7 +693,6 @@ sub _resolve_prereqs {
}
}
- my $flag;
for my $aref (@install_me) {
my($modobj,$version) = @$aref;
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index f428e3fb1f..b0cfc7bc7f 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
@@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION];
CPANPLUS::Internals::Report
];
-$VERSION = "0.9113";
+$VERSION = "0.9114";
=pod
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index e56ce681f8..dcc76bf4db 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
@@ -26,7 +26,7 @@ local $Data::Dumper::Indent = 1; # for dumpering from !
BEGIN {
use vars qw[ $VERSION @ISA ];
@ISA = qw[ CPANPLUS::Shell::_Base::ReadLine ];
- $VERSION = "0.9113";
+ $VERSION = "0.9114";
}
load CPANPLUS::Shell;