r14931 - in /branches/upstream/libfile-spec-perl/current: ./ lib/File/ lib/File/Spec/ t/

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Thu Feb 14 21:38:06 UTC 2008


Author: gregoa-guest
Date: Thu Feb 14 21:38:00 2008
New Revision: 14931

URL: http://svn.debian.org/wsvn/?sc=1&rev=14931
Log:
[svn-upgrade] Integrating new upstream version, libfile-spec-perl (3.2701)

Modified:
    branches/upstream/libfile-spec-perl/current/Changes
    branches/upstream/libfile-spec-perl/current/Cwd.pm
    branches/upstream/libfile-spec-perl/current/META.yml
    branches/upstream/libfile-spec-perl/current/SIGNATURE
    branches/upstream/libfile-spec-perl/current/lib/File/Spec.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/Cygwin.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/Epoc.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/Functions.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/Mac.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/OS2.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/Unix.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/VMS.pm
    branches/upstream/libfile-spec-perl/current/lib/File/Spec/Win32.pm
    branches/upstream/libfile-spec-perl/current/t/Spec.t

Modified: branches/upstream/libfile-spec-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/Changes?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/Changes (original)
+++ branches/upstream/libfile-spec-perl/current/Changes Thu Feb 14 21:38:00 2008
@@ -1,6 +1,12 @@
 Revision history for Perl distribution PathTools.
 
-3.27
+ - Fixed an edge case for Win32 catdir('C:', 'foo') and catfile('C:',
+   'foo.txt') (which the caller's not really supposed to do, that's
+   what catpath() is for) that changed between versions.  Now we're
+   back to the old behavior, which was to return C:\foo and C:\foo.txt .
+   [Audrey Tang]
+
+3.27 - Wed Jan 16 20:20:49 2008
 
  - If strlcpy() and strlcat() aren't available on the user's system,
    we now use ppport.h to provide them, so our C code works. [Steve

Modified: branches/upstream/libfile-spec-perl/current/Cwd.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/Cwd.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/Cwd.pm (original)
+++ branches/upstream/libfile-spec-perl/current/Cwd.pm Thu Feb 14 21:38:00 2008
@@ -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);

Modified: branches/upstream/libfile-spec-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/META.yml?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/META.yml (original)
+++ branches/upstream/libfile-spec-perl/current/META.yml Thu Feb 14 21:38:00 2008
@@ -1,6 +1,6 @@
 ---
 name: PathTools
-version: 3.27
+version: 3.2701
 author:
   - 'Maintained by Ken Williams <KWILLIAMS at cpan.org>'
 abstract: Tools for working with paths and file specs across platforms
@@ -21,34 +21,34 @@
 provides:
   Cwd:
     file: Cwd.pm
-    version: 3.27
+    version: 3.2701
   File::Spec:
     file: lib/File/Spec.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::Cygwin:
     file: lib/File/Spec/Cygwin.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::Epoc:
     file: lib/File/Spec/Epoc.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::Functions:
     file: lib/File/Spec/Functions.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::Mac:
     file: lib/File/Spec/Mac.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::OS2:
     file: lib/File/Spec/OS2.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::Unix:
     file: lib/File/Spec/Unix.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::VMS:
     file: lib/File/Spec/VMS.pm
-    version: 3.27
+    version: 3.2701
   File::Spec::Win32:
     file: lib/File/Spec/Win32.pm
-    version: 3.27
+    version: 3.2701
 generated_by: Module::Build version 0.2808
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.2.html

Modified: branches/upstream/libfile-spec-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/SIGNATURE?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/SIGNATURE (original)
+++ branches/upstream/libfile-spec-perl/current/SIGNATURE Thu Feb 14 21:38:00 2008
@@ -15,25 +15,25 @@
 Hash: SHA1
 
 SHA1 1197012d986a400414e13e25d519db39d392c730 Build.PL
-SHA1 01c4e5fd8643c35ed8a7f690eda85e6480f3614f Changes
-SHA1 dafcc38fa616d937fbf2fd511b02aa7abf7f59f0 Cwd.pm
+SHA1 ed7091cda8d093ad745b3f8f730c7a2f0c370966 Changes
+SHA1 de7e341ebf8859efcf3f4397ebd187b02cae0779 Cwd.pm
 SHA1 9691a4713c8ad848302b29bec74ca1652ef55ab1 Cwd.xs
 SHA1 ac6246562c365a8ad62f910ef31ce514d5a7e292 INSTALL
 SHA1 58c981892283d338e23971c5926089e0a6812caf MANIFEST
-SHA1 8078245ce9a9fbd6c86cf2dc38ea291ce096c784 META.yml
+SHA1 2a847578fe4d406d7630e78a96f5d7659f0e88c5 META.yml
 SHA1 3fb144a9fe45192b55f0b2950c7074241b4f4aa8 Makefile.PL
-SHA1 8d32bec3db1b74a87ce4fe227a63365072e61ce1 lib/File/Spec.pm
-SHA1 f929b8f8098de19bed2fc90da12eb48c3d215b3b lib/File/Spec/Cygwin.pm
-SHA1 8cc1639b561a544c893cfd4691cd9679f0c544d0 lib/File/Spec/Epoc.pm
-SHA1 62a17ab30b591e0b2a907c01ee29dcca9f4c294e lib/File/Spec/Functions.pm
-SHA1 4ce94e88eb527ddc43f57299d7e37cf60f32f366 lib/File/Spec/Mac.pm
-SHA1 f9d9d196b346edc2f4a88d78ba1bd8c4a8e366ae lib/File/Spec/OS2.pm
-SHA1 ad9807977f6e1617f2b8167a982074dc148dcc4d lib/File/Spec/Unix.pm
-SHA1 3ee2da4e4df361d35a61bb1bd67eef601ac9fa7a lib/File/Spec/VMS.pm
-SHA1 6df9bef58f0d93004610ccc824a1b0831fcbb3b9 lib/File/Spec/Win32.pm
+SHA1 aa5ba0b36fdb7334a5277dab9c679c4b69346568 lib/File/Spec.pm
+SHA1 c472ae16f1c7ab39ff4f7851fe8053afde279a56 lib/File/Spec/Cygwin.pm
+SHA1 9aed1a2d107df5820a9e7d961d4a9c52aecb660b lib/File/Spec/Epoc.pm
+SHA1 70cb76f83eb7944ab6469c07dfc1f470359114bb lib/File/Spec/Functions.pm
+SHA1 f2f10c40181b2c9f810c2c0a0b01fbf2fc008d0d lib/File/Spec/Mac.pm
+SHA1 3f3232bf3d8505a8a4dcb73039d97a8d791d0501 lib/File/Spec/OS2.pm
+SHA1 eec230f65cef1a12dba368dde813423a5cd704fc lib/File/Spec/Unix.pm
+SHA1 0b8d9acfde082d25a35e9c12de6753a4721046d6 lib/File/Spec/VMS.pm
+SHA1 287669726408f71cadc4c9d107e19c0f79a71dc3 lib/File/Spec/Win32.pm
 SHA1 985bfff322df915f46b27f12e84b5674db9ad8a5 ppport.h
 SHA1 77d045c1404fbe4c0910ed986b286f7b7b7d560d t/Functions.t
-SHA1 8cad7c6b3037360884d7d8c265253387e56a587a t/Spec.t
+SHA1 5d0d48593a68668273cb36f7aacb0e84facc24b7 t/Spec.t
 SHA1 88e00161e3c3108009dfba94ca64146badeceb7e t/crossplatform.t
 SHA1 9862a3f294bb4a7d372cea0df551afa0f7a58177 t/cwd.t
 SHA1 220a2b1de7f23aedf2f9daba53238c3d0b06db63 t/lib/Test/Builder.pm
@@ -47,7 +47,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (Darwin)
 
-iD8DBQFHjrtygrvMBLfvlHYRAva0AKCNvbOLEBW+qG9rVOVhzNLq4tP8gQCgnem3
-GwaMAEHonRZ114sktKTfuQw=
-=/K8l
+iD8DBQFHsRXggrvMBLfvlHYRAnMBAJ9kfFAXhi5MFda9spM8GYAuPLnXNQCg4t5+
+H+umDGfx5/ePaDsIKwxZyQk=
+=3l7n
 -----END PGP SIGNATURE-----

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec.pm Thu Feb 14 21:38:00 2008
@@ -3,7 +3,7 @@
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = '3.27';
+$VERSION = '3.2701';
 $VERSION = eval $VERSION;
 
 my %module = (MacOS   => 'Mac',

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/Cygwin.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/Cygwin.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/Cygwin.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/Cygwin.pm Thu Feb 14 21:38:00 2008
@@ -4,7 +4,7 @@
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.27';
+$VERSION = '3.2701';
 
 @ISA = qw(File::Spec::Unix);
 

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/Epoc.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/Epoc.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/Epoc.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/Epoc.pm Thu Feb 14 21:38:00 2008
@@ -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);

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/Functions.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/Functions.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/Functions.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/Functions.pm Thu Feb 14 21:38:00 2008
@@ -5,7 +5,7 @@
 
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
 
-$VERSION = '3.27';
+$VERSION = '3.2701';
 
 require Exporter;
 

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/Mac.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/Mac.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/Mac.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/Mac.pm Thu Feb 14 21:38:00 2008
@@ -4,7 +4,7 @@
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.27';
+$VERSION = '3.2701';
 
 @ISA = qw(File::Spec::Unix);
 

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/OS2.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/OS2.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/OS2.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/OS2.pm Thu Feb 14 21:38:00 2008
@@ -4,7 +4,7 @@
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.27';
+$VERSION = '3.2701';
 
 @ISA = qw(File::Spec::Unix);
 

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/Unix.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/Unix.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/Unix.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/Unix.pm Thu Feb 14 21:38:00 2008
@@ -3,7 +3,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '3.27';
+$VERSION = '3.2701';
 
 =head1 NAME
 

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/VMS.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/VMS.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/VMS.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/VMS.pm Thu Feb 14 21:38:00 2008
@@ -4,7 +4,7 @@
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.27';
+$VERSION = '3.2701';
 
 @ISA = qw(File::Spec::Unix);
 

Modified: branches/upstream/libfile-spec-perl/current/lib/File/Spec/Win32.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/lib/File/Spec/Win32.pm?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/lib/File/Spec/Win32.pm (original)
+++ branches/upstream/libfile-spec-perl/current/lib/File/Spec/Win32.pm Thu Feb 14 21:38:00 2008
@@ -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( @_ );
 }
 
@@ -145,6 +150,11 @@
     	unless @_;
     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( @_ );
 }

Modified: branches/upstream/libfile-spec-perl/current/t/Spec.t
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-spec-perl/current/t/Spec.t?rev=14931&op=diff
==============================================================================
--- branches/upstream/libfile-spec-perl/current/t/Spec.t (original)
+++ branches/upstream/libfile-spec-perl/current/t/Spec.t Thu Feb 14 21:38:00 2008
@@ -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('')",               ''                    ],




More information about the Pkg-perl-cvs-commits mailing list