From: David Golden <dagolden@cpan.org>
Date: Tue, 7 Jul 2009 08:10:33 +0000 (-0400)
Subject: limit what add-package.pl might try to delete
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=58118e0c79aaf5b753f6cd3cb5a0f4c1eb3ec55b;p=p5sagit%2Fp5-mst-13.2.git

limit what add-package.pl might try to delete

Old way looked in perl source for files matching exclude
list to delete.  New way looks only in source distribution.

This means that files already in perl source will need to be
manually removed, but avoids the risk that a bad exclusion
regex blows away unrelated things in the source tree.

Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl>
---

diff --git a/Porting/add-package.pl b/Porting/add-package.pl
index 6a07d7e..67b5b62 100644
--- a/Porting/add-package.pl
+++ b/Porting/add-package.pl
@@ -80,7 +80,7 @@ my @LibFiles;
                                 undef
                             }
                         : 1
-                     } `find $Repo/lib -type f`
+                     } `find lib -type f`
         or die "Could not detect library files\n";
       
     print "done\n" if $Verbose;
@@ -141,11 +141,11 @@ my @TestFiles;
                     ### should we get rid of this file?
                     grep { $ExcludeRe && $_ =~ $ExcludeRe
                         ? do {  warn "Removing $_\n";
-                                system("rm $_") and die "rm '$_' failed: $?";
+                                system("rm $TopDir/$_") and die "rm '$_' failed: $?";
                                 undef
                             }
                         : 1
-                     } `find $TopDir/t -type f`
+                     } `find t -type f`
         or die "Could not detect testfiles\n";
 
     print "done\n" if $Verbose;
@@ -173,11 +173,11 @@ BIN: {
                 ### should we get rid of this file?
                 grep { $ExcludeRe && $_ =~ $ExcludeRe
                     ? do {  warn "Removing $_\n";
-                            system("rm $_") and die "rm '$_' failed: $?";
+                            system("rm $TopDir/$_") and die "rm '$_' failed: $?";
                             undef
                         }
                     : 1
-                 } `find $TopBinDir -type f`
+                 } `find $BinDir -type f`
         or die "Could not detect binfiles\n";
 
     print "done\n" if $Verbose;