Change 33294 by [EMAIL PROTECTED] on 2008/02/12 15:11:48
Upgrade to PathTools-3.2701
Affected files ...
... //depot/perl/lib/Cwd.pm#113 edit
... //depot/perl/lib/File/Spec.pm#60 edit
... //depot/perl/lib/File/Spec/Cygwin.pm#22 edit
... //depot/perl/lib/File/Spec/Epoc.pm#13 edit
... //depot/perl/lib/File/Spec/Functions.pm#16 edit
... //depot/perl/lib/File/Spec/Mac.pm#31 edit
... //depot/perl/lib/File/Spec/OS2.pm#27 edit
... //depot/perl/lib/File/Spec/Unix.pm#62 edit
... //depot/perl/lib/File/Spec/VMS.pm#51 edit
... //depot/perl/lib/File/Spec/Win32.pm#48 edit
... //depot/perl/lib/File/Spec/t/Spec.t#28 edit
Differences ...
==== //depot/perl/lib/Cwd.pm#113 (text) ====
Index: perl/lib/Cwd.pm
--- perl/lib/Cwd.pm#112~33042~ 2008-01-22 20:12:37.000000000 -0800
+++ perl/lib/Cwd.pm 2008-02-12 07:11:48.000000000 -0800
@@ -171,7 +171,7 @@
use Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-$VERSION = '3.27';
+$VERSION = '3.2701';
@ISA = qw/ Exporter /;
@EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
==== //depot/perl/lib/File/Spec.pm#60 (text) ====
Index: perl/lib/File/Spec.pm
--- perl/lib/File/Spec.pm#59~33042~ 2008-01-22 20:12:37.000000000 -0800
+++ perl/lib/File/Spec.pm 2008-02-12 07:11:48.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw(@ISA $VERSION);
-$VERSION = '3.27';
+$VERSION = '3.2701';
$VERSION = eval $VERSION;
my %module = (MacOS => 'Mac',
==== //depot/perl/lib/File/Spec/Cygwin.pm#22 (text) ====
Index: perl/lib/File/Spec/Cygwin.pm
--- perl/lib/File/Spec/Cygwin.pm#21~33042~ 2008-01-22 20:12:37.000000000
-0800
+++ perl/lib/File/Spec/Cygwin.pm 2008-02-12 07:11:48.000000000 -0800
@@ -4,7 +4,7 @@
use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.27';
+$VERSION = '3.2701';
@ISA = qw(File::Spec::Unix);
==== //depot/perl/lib/File/Spec/Epoc.pm#13 (text) ====
Index: perl/lib/File/Spec/Epoc.pm
--- perl/lib/File/Spec/Epoc.pm#12~33042~ 2008-01-22 20:12:37.000000000
-0800
+++ perl/lib/File/Spec/Epoc.pm 2008-02-12 07:11:48.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '3.27';
+$VERSION = '3.2701';
require File::Spec::Unix;
@ISA = qw(File::Spec::Unix);
==== //depot/perl/lib/File/Spec/Functions.pm#16 (text) ====
Index: perl/lib/File/Spec/Functions.pm
--- perl/lib/File/Spec/Functions.pm#15~33042~ 2008-01-22 20:12:37.000000000
-0800
+++ perl/lib/File/Spec/Functions.pm 2008-02-12 07:11:48.000000000 -0800
@@ -5,7 +5,7 @@
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
-$VERSION = '3.27';
+$VERSION = '3.2701';
require Exporter;
==== //depot/perl/lib/File/Spec/Mac.pm#31 (text) ====
Index: perl/lib/File/Spec/Mac.pm
--- perl/lib/File/Spec/Mac.pm#30~33042~ 2008-01-22 20:12:37.000000000 -0800
+++ perl/lib/File/Spec/Mac.pm 2008-02-12 07:11:48.000000000 -0800
@@ -4,7 +4,7 @@
use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.27';
+$VERSION = '3.2701';
@ISA = qw(File::Spec::Unix);
==== //depot/perl/lib/File/Spec/OS2.pm#27 (text) ====
Index: perl/lib/File/Spec/OS2.pm
--- perl/lib/File/Spec/OS2.pm#26~33042~ 2008-01-22 20:12:37.000000000 -0800
+++ perl/lib/File/Spec/OS2.pm 2008-02-12 07:11:48.000000000 -0800
@@ -4,7 +4,7 @@
use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.27';
+$VERSION = '3.2701';
@ISA = qw(File::Spec::Unix);
==== //depot/perl/lib/File/Spec/Unix.pm#62 (text) ====
Index: perl/lib/File/Spec/Unix.pm
--- perl/lib/File/Spec/Unix.pm#61~33042~ 2008-01-22 20:12:37.000000000
-0800
+++ perl/lib/File/Spec/Unix.pm 2008-02-12 07:11:48.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.2701';
=head1 NAME
==== //depot/perl/lib/File/Spec/VMS.pm#51 (text) ====
Index: perl/lib/File/Spec/VMS.pm
--- perl/lib/File/Spec/VMS.pm#50~33042~ 2008-01-22 20:12:37.000000000 -0800
+++ perl/lib/File/Spec/VMS.pm 2008-02-12 07:11:48.000000000 -0800
@@ -4,7 +4,7 @@
use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.27';
+$VERSION = '3.2701';
@ISA = qw(File::Spec::Unix);
==== //depot/perl/lib/File/Spec/Win32.pm#48 (text) ====
Index: perl/lib/File/Spec/Win32.pm
--- perl/lib/File/Spec/Win32.pm#47~33042~ 2008-01-22 20:12:37.000000000
-0800
+++ perl/lib/File/Spec/Win32.pm 2008-02-12 07:11:48.000000000 -0800
@@ -5,7 +5,7 @@
use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.27';
+$VERSION = '3.2701';
@ISA = qw(File::Spec::Unix);
@@ -133,6 +133,11 @@
shift, return _canon_cat( "/", @_ )
if $_[0] eq "";
+ # Compatibility with File::Spec <= 3.26:
+ # catfile('A:', 'foo') should return 'A:\foo'.
+ return _canon_cat( ($_[0].'\\'), @_[1..$#_] )
+ if $_[0] =~ m{^$DRIVE_RX\z}o;
+
return _canon_cat( @_ );
}
@@ -146,6 +151,11 @@
shift, return _canon_cat( "/", @_ )
if $_[0] eq "";
+ # Compatibility with File::Spec <= 3.26:
+ # catdir('A:', 'foo') should return 'A:\foo'.
+ return _canon_cat( ($_[0].'\\'), @_[1..$#_] )
+ if $_[0] =~ m{^$DRIVE_RX\z}o;
+
return _canon_cat( @_ );
}
==== //depot/perl/lib/File/Spec/t/Spec.t#28 (text) ====
Index: perl/lib/File/Spec/t/Spec.t
--- perl/lib/File/Spec/t/Spec.t#27~33042~ 2008-01-22 20:12:37.000000000
-0800
+++ perl/lib/File/Spec/t/Spec.t 2008-02-12 07:11:48.000000000 -0800
@@ -207,6 +207,7 @@
[ "Win32->catdir('A:/')", 'A:\\' ],
[ "Win32->catdir('\\', 'foo')", '\\foo' ],
[ "Win32->catdir('','','..')", '\\' ],
+[ "Win32->catdir('A:', 'foo')", 'A:\\foo' ],
[ "Win32->catfile('a','b','c')", 'a\\b\\c' ],
[ "Win32->catfile('a','b','.\\c')", 'a\\b\\c' ],
@@ -214,6 +215,7 @@
[ "Win32->catfile('c')", 'c' ],
[ "Win32->catfile('.\\c')", 'c' ],
[ "Win32->catfile('a/..','../b')", '..\\b' ],
+[ "Win32->catfile('A:', 'foo')", 'A:\\foo' ],
[ "Win32->canonpath('')", '' ],
End of Patch.
