summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-02-28 15:12:22 +0000
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-02-28 15:57:11 +0000
commitfed587f11097fe177347c7d7c8cb826a5e4de1b3 (patch)
tree495e87a94f36a2b93d448cdf0e8c4c6081f4c042 /cpan
parent281a340fc9949f59cf3ae61917913b16c8924ce1 (diff)
downloadperl-fed587f11097fe177347c7d7c8cb826a5e4de1b3.tar.gz
Update CPANPLUS::Dist::Build to CPAN version 0.54
[DELTA] 0.54 Mon Feb 28 11:52:04 GMT 2011 - Only skip 'perl' as a prereq when CPANPLUS version is less than 0.9102
Diffstat (limited to 'cpan')
-rw-r--r--cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm14
-rw-r--r--cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm2
2 files changed, 10 insertions, 6 deletions
diff --git a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm
index 46c67da362..164bcb0a9e 100644
--- a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm
+++ b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm
@@ -30,7 +30,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext';
local $Params::Check::VERBOSE = 1;
-$VERSION = '0.52';
+$VERSION = '0.54';
=pod
@@ -145,8 +145,8 @@ to create and install modules in your environment.
### check if the format is available ###
sub format_available {
- my $mod = "Module::Build";
- unless( can_load( modules => { $mod => '0.2611' } ) ) {
+ my $mod = 'Module::Build';
+ unless( can_load( modules => { $mod => '0.2611' }, nocache => 1 ) ) {
error( loc( "You do not have '%1' -- '%2' not available",
$mod, __PACKAGE__ ) );
return;
@@ -426,8 +426,12 @@ sub _find_prereqs {
$prereqs->{$_} = $bphash->{$type}->{$_} for keys %{ $bphash->{$type} };
}
}
- # Temporary fix
- delete $prereqs->{'perl'};
+
+ {
+ delete $prereqs->{'perl'}
+ unless version->new($CPANPLUS::Internals::VERSION)
+ >= version->new('0.9102');
+ }
### allows for a user defined callback to filter the prerequisite
### list as they see fit, to remove (or add) any prereqs they see
diff --git a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm
index c57edc01bb..ba1ca8665c 100644
--- a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm
+++ b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm
@@ -9,7 +9,7 @@ BEGIN {
require Exporter;
use vars qw[$VERSION @ISA @EXPORT];
- $VERSION = '0.52';
+ $VERSION = '0.54';
@ISA = qw[Exporter];
@EXPORT = qw[ BUILD_DIR BUILD ];
}