diff options
| author | Nicholas Clark <nick@ccl4.org> | 2004-10-31 11:19:47 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2004-10-31 11:19:47 +0000 |
| commit | 21f4e7e5deb9dcacb7ae8fa00f7857b644748023 (patch) | |
| tree | d372be502f09883d1c3109e53b5d9c120042fb8e | |
| parent | 91d43147e4cecfbf37e858760e10b3a1bf877cd7 (diff) | |
| download | perl-21f4e7e5deb9dcacb7ae8fa00f7857b644748023.tar.gz | |
Assimilate PathTools 3.01 (File::Spec and Cwd)
p4raw-id: //depot/perl@23443
| -rw-r--r-- | ext/Cwd/t/cwd.t | 2 | ||||
| -rw-r--r-- | lib/Cwd.pm | 2 | ||||
| -rw-r--r-- | lib/File/Spec.pm | 2 | ||||
| -rw-r--r-- | lib/File/Spec/VMS.pm | 6 |
4 files changed, 4 insertions, 8 deletions
diff --git a/ext/Cwd/t/cwd.t b/ext/Cwd/t/cwd.t index fecb39f7e7..2c7624bba5 100644 --- a/ext/Cwd/t/cwd.t +++ b/ext/Cwd/t/cwd.t @@ -20,7 +20,7 @@ my $tests = 24; my $EXTRA_ABSPATH_TESTS = $ENV{PERL_CORE} || $ENV{TEST_PERL_CWD_CODE}; # _perl_abs_path() currently only works when the directory separator # is '/', so don't test it when it won't work. -$EXTRA_ABSPATH_TESTS &= $Config{prefix} =~ m/\//; +$EXTRA_ABSPATH_TESTS &&= $Config{prefix} =~ m/\//; $tests += 3 if $EXTRA_ABSPATH_TESTS; plan tests => $tests; diff --git a/lib/Cwd.pm b/lib/Cwd.pm index a90e944a3f..febd296bd3 100644 --- a/lib/Cwd.pm +++ b/lib/Cwd.pm @@ -1,5 +1,5 @@ package Cwd; -$VERSION = $VERSION = '2.21'; +$VERSION = $VERSION = '3.01'; =head1 NAME diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm index 93e363d583..a2c4b974c1 100644 --- a/lib/File/Spec.pm +++ b/lib/File/Spec.pm @@ -3,7 +3,7 @@ package File::Spec; use strict; use vars qw(@ISA $VERSION); -$VERSION = '0.90'; +$VERSION = '3.01'; $VERSION = eval $VERSION; my %module = (MacOS => 'Mac', diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm index c81c625604..82d639f3f1 100644 --- a/lib/File/Spec/VMS.pm +++ b/lib/File/Spec/VMS.pm @@ -477,11 +477,7 @@ sub rel2abs { my $self = shift ; my ($path,$base ) = @_; return undef unless defined $path; - if ($path =~ m/\//) { - $path = ( -d $path || $path =~ m/\/\z/ # educated guessing about - ? vmspath($path) # whether it's a directory - : vmsify($path) ); - } + $path = vmsify($path) if $path =~ m/\//; $base = vmspath($base) if defined $base && $base =~ m/\//; # Clean up and split up $path if ( ! $self->file_name_is_absolute( $path ) ) { |