From: Jos I. Boumans <jos@dwim.org>
Date: Wed, 25 Feb 2009 08:31:02 +0000 (+0100)
Subject: add-package.pl fixup
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=15e5e8668b86d4e43615103f790f9c1a736045dd;p=p5sagit%2Fp5-mst-13.2.git

add-package.pl fixup

Sometimes, using find, add-package.pl will construct filenames with 2
consecutive slashes, ie:

 Package-Name/bin//script.pl

As this literal string isn't in the MANIFEST yet, it'll be added
erroneously. The below patch fixes this.
---

diff --git a/Porting/add-package.pl b/Porting/add-package.pl
index ded907d..54a4f03 100644
--- a/Porting/add-package.pl
+++ b/Porting/add-package.pl
@@ -137,7 +137,7 @@ my @TestFiles;
        ? system( "cp -fR $CPV t $TopDir" ) && die "Copy of t/ failed: $?"
        : warn "No t/ directory found\n";
 
-    @TestFiles =    map { chomp; s|^$TopDirRe||; $_ }
+    @TestFiles =    map { chomp; s|^$TopDirRe||; s|//|/|g; $_ }
                     ### should we get rid of this file?
                     grep { $ExcludeRe && $_ =~ $ExcludeRe
                         ? do {  warn "Removing $_\n";
@@ -169,7 +169,7 @@ BIN: {
 
     system($CopyCmd) && die "Copy of $BinDir failed: $?";
 
-    @BinFiles = map { chomp; s|^$TopDirRe||; $_ }
+    @BinFiles = map { chomp; s|^$TopDirRe||; s|//|/|g; $_ }
                 ### should we get rid of this file?
                 grep { $ExcludeRe && $_ =~ $ExcludeRe
                     ? do {  warn "Removing $_\n";