[liblocal-lib-perl] 01/03: Imported Upstream version 1.008011

[Salvatore Bonaccorso]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to annotated tag debian/1.008011-1
in repository liblocal-lib-perl.

commit 793ed88e5b6657daf97afc87bae617551116c7f4
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Aug 7 21:34:17 2013 +0200

    Imported Upstream version 1.008011
---
 Changes          |    3 +++
 META.yml         |    2 +-
 Makefile.PL      |   32 +++++++++++++++++---------------
 lib/local/lib.pm |   10 +++++++++-
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Changes b/Changes
index ee1fad5..40d4b4f 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for local::lib
 
+1.008011 2013-07-26
+        - skip CPAN workaround if running via cpanminus  (miyagawa, RT#85731)
+
 1.008010 2013-05-26
         - Fix a split on undefined value warning (David Golden -- see
           https://github.com/gugod/App-perlbrew/issues/305)
diff --git a/META.yml b/META.yml
index 2e562fa..200aa41 100644
--- a/META.yml
+++ b/META.yml
@@ -29,4 +29,4 @@ resources:
   homepage: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/local-lib.git
   license: http://dev.perl.org/licenses/
   repository: git://git.shadowcat.co.uk/p5sagit/local-lib.git
-version: 1.008010
+version: 1.008011
diff --git a/Makefile.PL b/Makefile.PL
index d067451..9632385 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -183,24 +183,26 @@ all_from 'lib/local/lib.pm';
 requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
 requires 'ExtUtils::Install' => '1.43'; # ditto
 requires 'Module::Build' => '0.36'; # PERL_MB_OPT
-my $required_CPAN = '1.82';
-requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
 
-# No, really. See
-# https://rt.cpan.org/Public/Bug/Display.html?id=23735
-# for why CPAN now sets the CPANPLUS env var.
-# trouble is this means we can't auto_install(_now) CPAN itself
-# without this beautiful hack
+# don't bother fixing CPAN.pm if bootstrapped from cpanminus
+unless ($ENV{PERL5_CPANM_IS_RUNNING}) {
+    my $required_CPAN = '1.82';
+    requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
 
-my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
-my $no_cpan_env = !exists $ENV{PERL5_CPAN_IS_RUNNING};
-require CPAN;
-delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
-delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
+    # No, really. See
+    # https://rt.cpan.org/Public/Bug/Display.html?id=23735
+    # for why CPAN now sets the CPANPLUS env var.
+    # trouble is this means we can't auto_install(_now) CPAN itself
+    # without this beautiful hack
 
-# and make sure that the user doesn't have any existing CPAN config that'll
-# cause us problems for the next few steps.
-{
+    my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
+    my $no_cpan_env = !exists $ENV{PERL5_CPAN_IS_RUNNING};
+    require CPAN;
+    delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
+    delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
+
+    # and make sure that the user doesn't have any existing CPAN config that'll
+    # cause us problems for the next few steps.
     local $@;
     eval { require CPAN::HandleConfig; };
     # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't
diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 1e5a038..2e477e6 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -10,7 +10,7 @@ use File::Spec ();
 use File::Path ();
 use Config;
 
-our $VERSION = '1.008010'; # 1.8.10
+our $VERSION = '1.008011'; # 1.8.11
 
 our @KNOWN_FLAGS = qw(--self-contained --deactivate --deactivate-all);
 
@@ -1024,6 +1024,14 @@ On Win32 systems, C<COMSPEC> is also examined.
 
 =back
 
+=head1 SEE ALSO
+
+=over 4
+
+=item * L<Perl Advent article, 2011|http://perladvent.org/2011/2011-12-01.html>
+
+=back
+
 =head1 SUPPORT
 
 IRC:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/liblocal-lib-perl.git