From 263e3c8e079cba118b033d28c821a4a81867ba8b Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 28 Feb 2006 00:38:18 +0000
Subject: [PATCH] Handle a patch failure where the whole patch was rejected.

---
 verify-patches | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/verify-patches b/verify-patches
index 91eebbe..a7d0870 100755
--- a/verify-patches
+++ b/verify-patches
@@ -198,7 +198,7 @@ sub apply_patch
     system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
     print "\nApplying patch $diff...\n";
     undef @rejects;
-    my($saw_failure, $saw_offset, $saw_fuzz);
+    my($saw_offset, $saw_fuzz);
     open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!;
     while (<IN>) {
 	print $_;
@@ -207,15 +207,13 @@ sub apply_patch
 	    push(@new, $_) unless -f "cvsdir/$_";
 	} elsif (s/.* saving rejects to file //) {
 	    push(@rejects, $_);
-	} elsif (/^Hunk #\d+ FAILED/) {
-	    $saw_failure = 1;
 	} elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
 	    $saw_fuzz ||= defined $1;
 	    $saw_offset = 1;
 	}
     }
     close IN;
-    return 'F,D,E' if $saw_failure;
+    return 'F,D,E' if @rejects;
     return 'D,E' if $saw_fuzz && !$failures_only;
     return 'D,U,N' if $saw_offset && !$failures_only;
     'N';
-- 
2.34.1