r18729 - in /branches/upstream/libfile-copy-recursive-perl/current: Changes META.yml README Recursive.pm

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Thu Apr 17 20:08:59 2008
New Revision: 18729

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

Modified:
    branches/upstream/libfile-copy-recursive-perl/current/Changes
    branches/upstream/libfile-copy-recursive-perl/current/META.yml
    branches/upstream/libfile-copy-recursive-perl/current/README
    branches/upstream/libfile-copy-recursive-perl/current/Recursive.pm

Modified: branches/upstream/libfile-copy-recursive-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-copy-recursive-perl/current/Changes?rev=18729&op=diff
==============================================================================
--- branches/upstream/libfile-copy-recursive-perl/current/Changes (original)
+++ branches/upstream/libfile-copy-recursive-perl/current/Changes Thu Apr 17 20:08:59 2008
@@ -1,4 +1,7 @@
 Revision history for Perl extension File::Copy::Recursive.
+
+0.36  Wed Apr 16 15:32:36 2008
+    - made all bareword file handles be lexical variables if the perl is new enough to support it (5.6.0 and up, see 'Indirect Filehandles' in perlopentut)
 
 0.35  Mon Aug 27 16:18:53 2007
 	- fixed rt 29008

Modified: branches/upstream/libfile-copy-recursive-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-copy-recursive-perl/current/META.yml?rev=18729&op=diff
==============================================================================
--- branches/upstream/libfile-copy-recursive-perl/current/META.yml (original)
+++ branches/upstream/libfile-copy-recursive-perl/current/META.yml Thu Apr 17 20:08:59 2008
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         File-Copy-Recursive
-version:      0.35
+version:      0.36
 version_from: Recursive.pm
 installdirs:  site
 requires:
@@ -9,4 +9,4 @@
     File::Spec:                    0
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+generated_by: ExtUtils::MakeMaker version 6.30

Modified: branches/upstream/libfile-copy-recursive-perl/current/README
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-copy-recursive-perl/current/README?rev=18729&op=diff
==============================================================================
--- branches/upstream/libfile-copy-recursive-perl/current/README (original)
+++ branches/upstream/libfile-copy-recursive-perl/current/README Thu Apr 17 20:08:59 2008
@@ -1,4 +1,4 @@
-File/Copy/Recursive version 0.35
+File/Copy/Recursive version 0.36
 ================================
 
 This module has 3 functions, one to copy files only, one to copy directories 

Modified: branches/upstream/libfile-copy-recursive-perl/current/Recursive.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libfile-copy-recursive-perl/current/Recursive.pm?rev=18729&op=diff
==============================================================================
--- branches/upstream/libfile-copy-recursive-perl/current/Recursive.pm (original)
+++ branches/upstream/libfile-copy-recursive-perl/current/Recursive.pm Thu Apr 17 20:08:59 2008
@@ -20,7 +20,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(fcopy rcopy dircopy fmove rmove dirmove pathmk pathrm pathempty pathrmdir);
-$VERSION = '0.35';
+$VERSION = '0.36';
 
 $MaxDepth = 0;
 $KeepMode = 1;
@@ -199,9 +199,18 @@
       }
       $level++;
 
-      opendir(STR_DH, $str) or return;
-      my @files = grep( $_ ne '.' && $_ ne '..', readdir(STR_DH));
-      closedir STR_DH;
+      
+      my @files;
+      if ( $] < 5.006 ) {
+          opendir(STR_DH, $str) or return;
+          @files = grep( $_ ne '.' && $_ ne '..', readdir(STR_DH));
+          closedir STR_DH;
+      }
+      else {
+          opendir(my $str_dh, $str) or return;
+          @files = grep( $_ ne '.' && $_ ne '..', readdir($str_dh));
+          closedir $str_dh;
+      }
 
       for my $file (@files) {
           my ($file_ut) = $file =~ m{ (.*) }xms;
@@ -274,9 +283,18 @@
 
    return 2 if !-d $pth;
 
-   opendir(PTH_DH, $pth) or return;
-
-   for my $name (grep !/^\.+$/, readdir(PTH_DH)) {
+   my @names;
+   my $pth_dh;
+   if ( $] < 5.006 ) {
+       opendir(PTH_DH, $pth) or return;
+       @names = grep !/^\.+$/, readdir(PTH_DH);
+   }
+   else {
+       opendir($pth_dh, $pth) or return;
+       @names = grep !/^\.+$/, readdir($pth_dh);       
+   }
+   
+   for my $name (@names) {
       my ($name_ut) = $name =~ m{ (.*) }xms;
       my $flpth     = File::Spec->catdir($pth, $name_ut);
 
@@ -291,8 +309,13 @@
       }
    }
 
-   closedir PTH_DH;
-
+   if ( $] < 5.006 ) {
+       closedir PTH_DH;
+   }
+   else {
+       closedir $pth_dh;
+   }
+   
    1;
 }