rev 5354 - scripts/svn-hooks

[Modestas Vainius]

Author: modax-guest
Date: 2007-01-18 00:18:45 +0100 (Thu, 18 Jan 2007)
New Revision: 5354

Modified:
   scripts/svn-hooks/commit-email.pl
Log:
exclude buildprep from diffs, sent by email

Modified: scripts/svn-hooks/commit-email.pl
===================================================================
--- scripts/svn-hooks/commit-email.pl	2007-01-17 21:26:45 UTC (rev 5353)
+++ scripts/svn-hooks/commit-email.pl	2007-01-17 23:18:45 UTC (rev 5354)
@@ -38,6 +38,9 @@
 # Svnlook path.
 my $svnlook = "/usr/bin/svnlook";
 
+# Filterdiff path.
+my $filterdiff ="/usr/bin/filterdiff";
+
 # By default, when a file is deleted from the repository, svnlook diff
 # prints the entire contents of the file.  If you want to save space
 # in the log and email messages by not printing the file, then set
@@ -49,7 +52,7 @@
 # the administrator has set up the script properly.
 {
   my $ok = 1;
-  foreach my $program ($sendmail, $svnlook)
+  foreach my $program ($sendmail, $svnlook, $filterdiff)
     {
       if (-e $program)
         {
@@ -270,7 +273,8 @@
 # Get the diff from svnlook.
 my @no_diff_deleted = $no_diff_deleted ? ('--no-diff-deleted') : ();
 my @difflines = &read_from_process($svnlook, 'diff', $repos,
-                                   '-r', $rev, @no_diff_deleted);
+                                   '-r', $rev, @no_diff_deleted,
+				   "| $filterdiff", "-p3", "-x", "debian/patches/98_buildprep.diff" );
 
 ######################################################################
 # Modified directory name collapsing.
@@ -525,7 +529,7 @@
       croak "$0: safe_read_from_pipe passed no arguments.\n";
     }
 
-  my $pid = open(SAFE_READ, '-|');
+  my $pid = open(SAFE_READ, "@_ |" );
   unless (defined $pid)
     {
       die "$0: cannot fork: $!\n";