r75815 - in /branches/upstream/cpanminus/current: Changes META.json META.yml bin/cpanm lib/App/cpanminus.pm

[ghedo-guest at users.alioth.debian.org]

Author: ghedo-guest
Date: Thu Jun 16 13:58:13 2011
New Revision: 75815

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=75815
Log:
[svn-upgrade] new version cpanminus (1.4008)

Modified:
    branches/upstream/cpanminus/current/Changes
    branches/upstream/cpanminus/current/META.json
    branches/upstream/cpanminus/current/META.yml
    branches/upstream/cpanminus/current/bin/cpanm
    branches/upstream/cpanminus/current/lib/App/cpanminus.pm

Modified: branches/upstream/cpanminus/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/Changes?rev=75815&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/Changes (original)
+++ branches/upstream/cpanminus/current/Changes Thu Jun 16 13:58:13 2011
@@ -1,4 +1,9 @@
 See http://github.com/miyagawa/cpanminus/ for the latest development.
+
+1.4008 Wed Jun 15 17:58:28 PDT 2011
+   [Improvements]
+      - Added experimental --skip-configure
+      - Delay load Module::Build bootstrap so that -L won't auto-intall the latest M::B
 
 1.4007 Tue May 17 10:51:18 PDT 2011
    [Incompatible Changes]

Modified: branches/upstream/cpanminus/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/META.json?rev=75815&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/META.json (original)
+++ branches/upstream/cpanminus/current/META.json Thu Jun 16 13:58:13 2011
@@ -39,5 +39,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "1.4007"
+   "version" : "1.4008"
 }

Modified: branches/upstream/cpanminus/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/META.yml?rev=75815&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/META.yml (original)
+++ branches/upstream/cpanminus/current/META.yml Thu Jun 16 13:58:13 2011
@@ -21,4 +21,4 @@
   ExtUtils::Install: 1.46
   ExtUtils::MakeMaker: 6.31
   Module::Build: 0.36
-version: 1.4007
+version: 1.4008

Modified: branches/upstream/cpanminus/current/bin/cpanm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/bin/cpanm?rev=75815&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/bin/cpanm (original)
+++ branches/upstream/cpanminus/current/bin/cpanm Thu Jun 16 13:58:13 2011
@@ -18,7 +18,7 @@
 
 $fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';
   package App::cpanminus;
-  our $VERSION = "1.4007";
+  our $VERSION = "1.4008";
   
   =head1 NAME
   
@@ -314,7 +314,7 @@
   use constant WIN32 => $^O eq 'MSWin32';
   use constant SUNOS => $^O eq 'solaris';
   
-  our $VERSION = "1.4007";
+  our $VERSION = "1.4008";
   
   my $quote = WIN32 ? q/"/ : q/'/;
   
@@ -355,6 +355,7 @@
           scandeps_tree => [],
           format   => 'tree',
           save_dists => undef,
+          skip_configure => 0,
           @_,
       }, $class;
   }
@@ -409,6 +410,7 @@
           'save-dists=s' => sub {
               $self->{save_dists} = $self->maybe_abs($_[1]);
           },
+          'skip-configure!' => \$self->{skip_configure},
       );
   
       if (!@ARGV && $0 ne '-' && !-t STDIN){ # e.g. # cpanm < author/requires.cpanm
@@ -759,6 +761,8 @@
   sub _dump_inc {
       my($self, $inc, $std_inc) = @_;
   
+      # TODO Win32 has forward slashes in @INC but backslashes in %Config
+  
       # $self->{base} for ModuleBuildPatch.pm, . for inc/Module/Install.pm
       my @new_inc     = map { qq('$_') } (@$inc, $self->{base}, '.');
       my @exclude_inc = map { qq('$_') } grep { $_ ne '.' && !ref } $self->_diff($inc, $std_inc);
@@ -825,8 +829,7 @@
       my $self = shift;
       push @{$self->{bootstrap_deps}},
           'ExtUtils::MakeMaker' => 6.31,
-          'ExtUtils::Install'   => 1.46,
-          'Module::Build'       => 0.36;
+          'ExtUtils::Install'   => 1.46;
   }
   
   sub prompt_bool {
@@ -1357,8 +1360,10 @@
           # issues when a newer version is loaded from 'perl' while deps
           # are loaded from the 'site' library path. Just assume it's
           # not in the core, and install to the new local library path.
-          if ($mod eq 'Module::Build' && $core_version != $version) {
-              return 0, undef;
+          if ($mod eq 'Module::Build') {
+              if ($version < 0.36 or $core_version != $version) {
+                  return 0, undef;
+              }
           }
   
           $version = $core_version if $core_version;
@@ -1567,6 +1572,16 @@
   
   sub configure_this {
       my($self, $dist) = @_;
+  
+      if ($self->{skip_configure}) {
+          my $eumm = -e 'Makefile';
+          my $mb   = -e 'Build' && -f _;
+          return {
+              configured => 1,
+              configured_ok => $eumm || $mb,
+              use_module_build => $mb,
+          };
+      }
   
       my @switches;
       @switches = ("-I$self->{base}", "-MDumpedINC") if $self->{self_contained};
@@ -5476,7 +5491,7 @@
 =item --look
 
 Download and unpack the distribution and then open the directory with
-your shell. Handy to poke around the source code or do the manual
+your shell. Handy to poke around the source code or do manual
 testing.
 
 =item -h, --help

Modified: branches/upstream/cpanminus/current/lib/App/cpanminus.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/lib/App/cpanminus.pm?rev=75815&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/lib/App/cpanminus.pm (original)
+++ branches/upstream/cpanminus/current/lib/App/cpanminus.pm Thu Jun 16 13:58:13 2011
@@ -1,5 +1,5 @@
 package App::cpanminus;
-our $VERSION = "1.4007";
+our $VERSION = "1.4008";
 
 =head1 NAME