From 55ddf00bc2f14f9ba42adf38b20f9da7a7807f4c Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 7 Jul 2007 05:27:32 +0000
Subject: [PATCH] Call "patch" with the -f option, and handle an error
 condition where the whole file fails.

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

diff --git a/verify-patches b/verify-patches
index 6c77581..64ae506 100755
--- a/verify-patches
+++ b/verify-patches
@@ -90,7 +90,7 @@ foreach my $diff (@ARGV) {
 	    my $dep = $1;
 	    $has_dependencies = 1;
 	    print "\nApplying dependency patch $dep...\n";
-	    if (system("patch -d cvsdir -p1 -b -Vt <patches/$dep") != 0) {
+	    if (system("patch -f -d cvsdir -p1 -b -Vt <patches/$dep") != 0) {
 		print "Unable to cleanly apply dependency patch -- skipping $diff\n";
 		system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
 		&restore_cvsdir;
@@ -214,7 +214,7 @@ sub apply_patch
     print "\nApplying patch $diff...\n";
     undef @rejects;
     my($saw_offset, $saw_fuzz);
-    open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <patches/$diff |") or die $!;
+    open(IN, "patch -f -d workdir -p1 --no-backup-if-mismatch <patches/$diff |") or die $!;
     while (<IN>) {
 	print $_;
 	chomp;
@@ -222,6 +222,8 @@ sub apply_patch
 	    push(@new, $_) unless -f "cvsdir/$_";
 	} elsif (s/.* saving rejects to file //) {
 	    push(@rejects, $_);
+	} elsif (/No file to patch\.\s+Skipping patch/) {
+	    push(@rejects, 'skipped.file');
 	} elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
 	    $saw_fuzz ||= defined $1;
 	    $saw_offset = 1;
-- 
2.34.1