From 7c88f9bfbca39235ad8684f982cea1927ae66a74 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 14 Jul 2004 17:35:51 +0000
Subject: [PATCH] Cleanup any reject files after a dependency patch fails to
 apply.

---
 verify-patches | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/verify-patches b/verify-patches
index 6b2cca9..506f4c6 100755
--- a/verify-patches
+++ b/verify-patches
@@ -62,6 +62,7 @@ foreach my $diff (@ARGV) {
 	    print "\nApplying dependency patch $dep...\n";
 	    if (system("patch -d cvsdir -p0 -b -Vt -Zf <../$dep") != 0) {
 		print "Unable to cleanly apply depenency patch -- skipping $diff\n";
+		system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
 		&restore_cvsdir;
 		next DIFF;
 	    }
@@ -70,7 +71,7 @@ foreach my $diff (@ARGV) {
     close IN;
 
     my $default = apply_patch($diff);
-    if ($default eq 'N') {
+    if ($default =~ /[NE]/) {
 	generate_new_patch($diff);
     }
 
@@ -89,7 +90,7 @@ foreach my $diff (@ARGV) {
 		chdir('workdir') or die $!;
 		system $cmd;
 		chdir('..') or die $!;
-		$default = 'D,E';
+		$default = 'D';
 		next;
 	    }
 	    if ($cmd eq 'A') {
-- 
2.34.1