X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fadd-package.pl;h=b403bcaba0e1d7be540ce6d9af7ab206208043c0;hb=953f6acfa20ec275ec39a552dfac8124bd93ebdf;hp=db4c531671f24791f7939adb355fe02a22d9d2aa;hpb=28f2d4d1a9ee0dc43de025aac86c30a6932449c8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/add-package.pl b/Porting/add-package.pl
index db4c531..b403bca 100644
--- a/Porting/add-package.pl
+++ b/Porting/add-package.pl
@@ -407,14 +407,20 @@ my @NewFiles;
 if( $RunDiff ) {
     my $diff = $Repo; $diff =~ s/$$/patch/;
 
-    print "Generating diff..." if $Verbose;
-
     ### weird RV ;(
     my $master = basename( $MasterRepo );
     my $repo   = basename( $Repo );
     my $chdir  = dirname( $MasterRepo );
 
-    system( "cd $chdir; diff -ruN $master $repo > $diff" );
+    ### the .patch file is added by an rsync from the APC
+    ### but isn't actually in the p4 repo, so exclude it
+    my $cmd = "cd $chdir; diff -ruN --exclude=.patch $master $repo > $diff";
+
+    print "Running: '$cmd'\n";
+
+    print "Generating diff..." if $Verbose;
+
+    system( $cmd );
         #and die "Could not write diff to '$diff': $?";
     die "Could not write diff to '$diff'" unless -e $diff && -s _;