In cpl_conf_pl.gdiff is a patch for lib/CPANPLUS/t/inc/conf.pl to require the ".dir" to be at the end of the file.

In cpl_dist_conf.pl is a patch to make /lib/CPANPLUS/Dist/Build/t/inc/conf.pl match up with /lib/CPANPLUS/t/inc/conf.pl by only doing the directory specific name modifications if the file is actually a directory.

-John
[EMAIL PROTECTED]
Personal Opinion Only
--- /rsync_root/perl/lib/CPANPLUS/Dist/Build/t/inc/conf.pl      Fri Nov  9 
16:50:29 2007
+++ lib/CPANPLUS/Dist/Build/t/inc/conf.pl       Sun Nov 11 01:13:00 2007
@@ -127,16 +127,20 @@
             ### XXX See http://www.xray.mpe.mpg.de/
             ### mailing-lists/perl5-porters/2007-10/msg00064.html
             ### for details -- the below regex could use some touchups
-            ### according to John. M.            
-            $file =~ s/\.dir//i if $^O eq 'VMS';
-            
-            my $dirpath = File::Spec->catdir( $dir, $file );
-            
+            ### according to John. M.
+
             ### directory, rmtree it
             if( -d $path ) {
-                print "# Deleting directory '$path'\n" if $verbose;
-                eval { rmtree( $path ) };
-                warn "Could not delete '$path' while cleaning up '$dir'" if $@;
+
+                $file =~ s/\.dir$//i if $^O eq 'VMS';
+
+                ### Need a path specification here, not a file.
+                my $dirpath = File::Spec->catdir( $dir, $file );
+
+                print "# Deleting directory '$dirpath'\n" if $verbose;
+                eval { rmtree( $dirpath ) };
+                warn "Could not delete '$dirpath' while cleaning up '$dir'"
+                    if $@;
            
             ### regular file
             } else {
--- /rsync_root/perl/lib/CPANPLUS/t/inc/conf.pl Fri Nov  9 16:50:29 2007
+++ lib/CPANPLUS/t/inc/conf.pl  Sun Nov 11 02:04:40 2007
@@ -272,7 +272,7 @@
                 ### mailing-lists/perl5-porters/2007-10/msg00064.html
                 ### for details -- the below regex could use some touchups
                 ### according to John. M.            
-                $file =~ s/\.dir//i if $^O eq 'VMS';
+                $file =~ s/\.dir$//i if $^O eq 'VMS';
                 
                 my $dirpath = File::Spec->catdir( $dir, $file );
 

Reply via email to