summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm')
-rw-r--r--Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm24
1 files changed, 14 insertions, 10 deletions
diff --git a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm
index 0f27639cda5..164bcb0a9ec 100644
--- a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm
+++ b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm
@@ -30,7 +30,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext';
local $Params::Check::VERBOSE = 1;
-$VERSION = '0.46';
+$VERSION = '0.54';
=pod
@@ -98,7 +98,7 @@ BOOL indicating if the C<Build test> command was successful.
=item C<prepared ()>
-BOOL indicating if the C<prepare> call exited succesfully
+BOOL indicating if the C<prepare> call exited successfully
This gets set after C<perl Build.PL>
=item C<distdir ()>
@@ -108,7 +108,7 @@ set after a call to C<prepare>.
=item C<created ()>
-BOOL indicating if the C<create> call exited succesfully. This gets
+BOOL indicating if the C<create> call exited successfully. This gets
set after C<Build> and C<Build test>.
=item C<installed ()>
@@ -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;
@@ -192,7 +192,7 @@ The variable C<PERL5_CPANPLUS_IS_EXECUTING> will be set to the full path
of the C<Build.PL> that is being executed. This enables any code inside
the C<Build.PL> to know that it is being installed via CPANPLUS.
-After a succcesfull C<prepare> you may call C<create> to create the
+After a successful C<prepare> you may call C<create> to create the
distribution, followed by C<install> to actually install it.
Returns true on success and false on failure.
@@ -275,9 +275,9 @@ sub prepare {
### we resolve 'configure requires' here, so we can run the 'perl
### Makefile.PL' command
### XXX for tests: mock f_c_r to something that *can* resolve and
- ### something that *doesnt* resolve. Check the error log for ok
+ ### something that *doesn't* resolve. Check the error log for ok
### on this step or failure
- ### XXX make a seperate tarball to test for this scenario: simply
+ ### XXX make a separate tarball to test for this scenario: simply
### containing a makefile.pl/build.pl for test purposes?
my $safe_ver = version->new('0.85_01');
if ( version->new($CPANPLUS::Internals::VERSION) >= $safe_ver )
@@ -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