[Rt-commit] r5834 - in Class-Accessor-Named: . inc/Module

schwern at bestpractical.com schwern at bestpractical.com
Wed Aug 30 21:07:29 EDT 2006


Author: schwern
Date: Wed Aug 30 21:07:27 2006
New Revision: 5834

Modified:
   Class-Accessor-Named/   (props changed)
   Class-Accessor-Named/META.yml
   Class-Accessor-Named/inc/Module/AutoInstall.pm
   Class-Accessor-Named/inc/Module/Install.pm
   Class-Accessor-Named/inc/Module/Install/AutoInstall.pm
   Class-Accessor-Named/inc/Module/Install/Base.pm
   Class-Accessor-Named/inc/Module/Install/Can.pm
   Class-Accessor-Named/inc/Module/Install/Fetch.pm
   Class-Accessor-Named/inc/Module/Install/Include.pm
   Class-Accessor-Named/inc/Module/Install/Makefile.pm
   Class-Accessor-Named/inc/Module/Install/Metadata.pm
   Class-Accessor-Named/inc/Module/Install/Win32.pm
   Class-Accessor-Named/inc/Module/Install/WriteAll.pm

Log:
 r17659 at windhund:  schwern | 2006-08-30 20:49:52 -0400
 Upgrade Module::Install to 0.64


Modified: Class-Accessor-Named/META.yml
==============================================================================
--- Class-Accessor-Named/META.yml	(original)
+++ Class-Accessor-Named/META.yml	Wed Aug 30 21:07:27 2006
@@ -3,7 +3,7 @@
 build_requires: 
   Test::Dependencies: 0
 distribution_type: module
-generated_by: Module::Install version 0.63
+generated_by: Module::Install version 0.64
 license: perl
 name: Class-Accessor-Named
 no_index: 
@@ -14,4 +14,4 @@
   Hook::LexWrap: 0
   Sub::Name: 0
   UNIVERSAL::require: 0
-version: 0.002
+version: 0.004

Modified: Class-Accessor-Named/inc/Module/AutoInstall.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/AutoInstall.pm	(original)
+++ Class-Accessor-Named/inc/Module/AutoInstall.pm	Wed Aug 30 21:07:27 2006
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.02';
+	$VERSION = '1.03';
 }
 
 # special map on pre-defined feature sets
@@ -214,7 +214,7 @@
         }
     }
 
-    _check_lock();    # check for $UnderCPAN
+    $UnderCPAN = _check_lock();    # check for $UnderCPAN
 
     if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
         require Config;
@@ -234,9 +234,20 @@
     *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
 }
 
-# CPAN.pm is non-reentrant, so check if we're under it and have no CPANPLUS
+# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
+# if we are, then we simply let it taking care of our dependencies
 sub _check_lock {
     return unless @Missing;
+
+    if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
+        print <<'END_MESSAGE';
+
+*** Since we're running under CPANPLUS, I'll just let it take care
+    of the dependency's installation later.
+END_MESSAGE
+        return 1;
+    }
+
     _load_cpan();
 
     # Find the CPAN lock-file
@@ -256,10 +267,11 @@
 *** Since we're running under CPAN, I'll just let it take care
     of the dependency's installation later.
 END_MESSAGE
-        $UnderCPAN = 1;
+        return 1;
     }
 
     close LOCK;
+    return;
 }
 
 sub install {
@@ -280,7 +292,8 @@
         }
     }
 
-    return @installed unless @modules;    # nothing to do
+    return @installed unless @modules;  # nothing to do
+    return @installed if _check_lock(); # defer to the CPAN shell
 
     print "*** Installing dependencies...\n";
 
@@ -300,7 +313,7 @@
         @modules = @newmod;
     }
 
-    if ( ! $UnderCPAN and _has_cpanplus() ) {
+    if ( _has_cpanplus() ) {
         _install_cpanplus( \@modules, \@config );
     } else {
         _install_cpan( \@modules, \@config );
@@ -466,9 +479,9 @@
                 delete $INC{$inc};
             }
 
-            $obj->force('install') if $args{force};
-
-            my $rv = $obj->install || eval {
+            my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
+                                  : CPAN::Shell->install($pkg);
+            $rv ||= eval {
                 $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
                   ->{install}
                   if $CPAN::META;
@@ -752,4 +765,4 @@
 
 __END__
 
-#line 990
+#line 1003

Modified: Class-Accessor-Named/inc/Module/Install.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install.pm	Wed Aug 30 21:07:27 2006
@@ -28,7 +28,7 @@
     # This is not enforced yet, but will be some time in the next few
     # releases once we can make sure it won't clash with custom
     # Module::Install extensions.
-    $VERSION = '0.63';
+    $VERSION = '0.64';
 }
 
 # Whether or not inc::Module::Install is actually loaded, the

Modified: Class-Accessor-Named/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/AutoInstall.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/AutoInstall.pm	Wed Aug 30 21:07:27 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: Class-Accessor-Named/inc/Module/Install/Base.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/Base.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/Base.pm	Wed Aug 30 21:07:27 2006
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.63';
+$VERSION = '0.64';
 
 # Suspend handler for "redefined" warnings
 BEGIN {

Modified: Class-Accessor-Named/inc/Module/Install/Can.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/Can.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/Can.pm	Wed Aug 30 21:07:27 2006
@@ -11,7 +11,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: Class-Accessor-Named/inc/Module/Install/Fetch.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/Fetch.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/Fetch.pm	Wed Aug 30 21:07:27 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: Class-Accessor-Named/inc/Module/Install/Include.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/Include.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/Include.pm	Wed Aug 30 21:07:27 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: Class-Accessor-Named/inc/Module/Install/Makefile.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/Makefile.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/Makefile.pm	Wed Aug 30 21:07:27 2006
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: Class-Accessor-Named/inc/Module/Install/Metadata.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/Metadata.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/Metadata.pm	Wed Aug 30 21:07:27 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: Class-Accessor-Named/inc/Module/Install/Win32.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/Win32.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/Win32.pm	Wed Aug 30 21:07:27 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: Class-Accessor-Named/inc/Module/Install/WriteAll.pm
==============================================================================
--- Class-Accessor-Named/inc/Module/Install/WriteAll.pm	(original)
+++ Class-Accessor-Named/inc/Module/Install/WriteAll.pm	Wed Aug 30 21:07:27 2006
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.63';
+	$VERSION = '0.64';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }


More information about the Rt-commit mailing list