diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1999-07-26 03:15:33 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-07-26 03:15:33 +0000 |
| commit | 7133e2e1b032a72339d416d7065b055fe27fd60b (patch) | |
| tree | bf6d8792c6d0bb8807b4400b4a22f1233709b7c7 /lib | |
| parent | eaa21ad6d74f8ed1e3a6512a82f2e76df279a77a (diff) | |
| download | perl-7133e2e1b032a72339d416d7065b055fe27fd60b.tar.gz | |
INSTALL =~ s/5.006/5.6/; delay loading Errno until needed
(%! has the necessary magic); misc typos
p4raw-id: //depot/perl@3754
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AutoLoader.pm | 3 | ||||
| -rw-r--r-- | lib/CPAN.pm | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm index 1ca3b14520..66c764f9d8 100644 --- a/lib/AutoLoader.pm +++ b/lib/AutoLoader.pm @@ -219,14 +219,13 @@ lines: use AutoLoader; use Carp; - use Errno; sub AUTOLOAD { my $sub = $AUTOLOAD; (my $constname = $sub) =~ s/.*:://; my $val = constant($constname, @_ ? $_[0] : 0); if ($! != 0) { - if ($!{EINVAL} || $! =~ /Invalid/) { + if ($! =~ /Invalid/ || $!{EINVAL}) { $AutoLoader::AUTOLOAD = $sub; goto &AutoLoader::AUTOLOAD; } diff --git a/lib/CPAN.pm b/lib/CPAN.pm index 401660ef44..432e72da05 100644 --- a/lib/CPAN.pm +++ b/lib/CPAN.pm @@ -19,7 +19,6 @@ use Config (); use Cwd (); use DirHandle; use Exporter (); -use Errno (); use ExtUtils::MakeMaker (); # $SelfLoader::DEBUG=1; use File::Basename (); use File::Copy (); @@ -576,7 +575,7 @@ Please make sure the directory exists and is writable. } my $fh; unless ($fh = FileHandle->new(">$lockfile")) { - if ($!{EACCES} || $! =~ /Permission/) { + if ($! =~ /Permission/ || $!{EACCES}) { my $incc = $INC{'CPAN/Config.pm'}; my $myincc = MM->catfile($ENV{HOME},'.cpan','CPAN','MyConfig.pm'); $CPAN::Frontend->myprint(qq{ |