X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCPAN.pm;h=2f22b773c783d3e9a6484173ba924c03b52f0d71;hb=bee32ff8f5fb3bbd86101dcb039642bf5fde9142;hp=3f3b980c1178a188302fa23ded80fa8ecfd37624;hpb=36263cb347dc0d66c6ed49be3e8c8a14c5d21ffb;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/CPAN.pm b/lib/CPAN.pm
index 3f3b980..2f22b77 100644
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
@@ -575,7 +575,7 @@ Please make sure the directory exists and is writable.
     }
     my $fh;
     unless ($fh = FileHandle->new(">$lockfile")) {
-	if ($! =~ /Permission/) {
+	if ($! =~ /Permission/ || $!{EACCES}) {
 	    my $incc = $INC{'CPAN/Config.pm'};
 	    my $myincc = MM->catfile($ENV{HOME},'.cpan','CPAN','MyConfig.pm');
 	    $CPAN::Frontend->myprint(qq{
@@ -3325,7 +3325,8 @@ sub perl {
     $perl ||= $candidate if MM->maybe_command($candidate);
     unless ($perl) {
 	my ($component,$perl_name);
-      DIST_PERLNAME: foreach $perl_name ($^X, 'perl', 'perl5', "perl$]") {
+      DIST_PERLNAME:
+	foreach $perl_name ($^X, 'perl', 'perl5', "perl$Config::Config{version}") {
 	    PATH_COMPONENT: foreach $component (MM->path(),
 						$Config::Config{'binexp'}) {
 		  next unless defined($component) && $component;