[svn:CPANPLUS-Dist-Build] r14726 - CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist

Author: BINGOS
Date: Mon Feb 28 03:50:14 2011
New Revision: 14726

Modified:
   CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm

Log:
Only delete 'perl' as a prereq if CPANPLUS version is less than 0.9102

Modified: CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm
==============================================================================
--- CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm	(original)
+++ CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm	Mon Feb 28 03:50:14 2011
@@ -145,8 +145,8 @@
 
 ### 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 @@
         $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