summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-02-28 15:17:27 +0000
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-02-28 15:57:11 +0000
commit873fac80e45ace36c5ffa4e2624eec835434847f (patch)
tree9611f4dd039cfffbe7641e4ca18b759c766bb483 /cpan
parentfed587f11097fe177347c7d7c8cb826a5e4de1b3 (diff)
downloadperl-873fac80e45ace36c5ffa4e2624eec835434847f.tar.gz
Update CPANPLUS to CPAN version 0.9102
[DELTA] Changes for 0.9102 Mon Feb 28 11:35:43 2011 ================================================ * Only send NAs for a 'perl' prereq when it actually is Not Applicable
Diffstat (limited to 'cpan')
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Internals.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm30
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm2
4 files changed, 26 insertions, 10 deletions
diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index 3e63cb3969..79a48164a9 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.9101"; #have to hardcode or cpan.org gets unhappy
+ $VERSION = "0.9102"; #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/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index 2115fadfa3..cf23e920cc 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.9101";
+$VERSION = "0.9102";
=pod
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
index e55c04a003..a5f079b263 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
@@ -11,6 +11,7 @@ use Data::Dumper;
use Params::Check qw[check];
use Module::Load::Conditional qw[can_load];
use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext';
+use version;
$Params::Check::VERBOSE = 1;
@@ -347,7 +348,22 @@ sub _send_report {
### as FAIL modules where prereqs are not filled
{ my $prq = $mod->status->prereqs || {};
- while( my($prq_name,$prq_ver) = each %$prq ) {
+ PREREQ: while( my($prq_name,$prq_ver) = each %$prq ) {
+
+ # 'perl' listed as prereq
+
+ if ( $prq_name eq 'perl' ) {
+ my $req_ver = eval { version->new( $prq_ver ) };
+ next PREREQ unless $req_ver;
+ if ( version->new( $] ) < $req_ver ) {
+ msg(loc("'%1' requires a higher version of perl than your current ".
+ "version -- sending N/A grade.", $name), $verbose);
+
+ $grade = GRADE_NA;
+ last GRADE;
+ }
+ }
+
my $obj = $cb->module_tree( $prq_name );
my $sub = CPANPLUS::Module->can(
'module_is_supplied_with_perl_core' );
@@ -365,7 +381,7 @@ sub _send_report {
$prq_name, $name ), $verbose );
$grade = GRADE_NA;
- last GRADE;
+ last GRADE;
}
if ( !$obj ) {
@@ -377,7 +393,7 @@ sub _send_report {
$name, $prq_ver ), $verbose );
$grade = GRADE_NA;
- last GRADE;
+ last GRADE;
}
}
@@ -388,7 +404,7 @@ sub _send_report {
$name, $prq_ver ), $verbose );
$grade = GRADE_NA;
- last GRADE;
+ last GRADE;
}
}
}
@@ -413,8 +429,8 @@ sub _send_report {
} elsif ( PERL_VERSION_TOO_LOW->( $buffer ) ) {
msg(loc("'%1' requires a higher version of perl than your current ".
"version -- sending N/A grade.", $name), $verbose);
-
- $grade = GRADE_NA;
+
+ $grade = GRADE_NA;
### perhaps where were no tests...
### see if the thing even had tests ###
@@ -426,7 +442,7 @@ sub _send_report {
$grade = GRADE_UNKNOWN
} else {
-
+
$grade = GRADE_FAIL;
}
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index 3d53b76b29..4a7a9e535c 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.9101";
+ $VERSION = "0.9102";
}
load CPANPLUS::Shell;