- I decided that we should leave as much of the real mode attached

[rsync/rsync-patches.git] / verify-patches

diff --git a/verify-patches b/verify-patches
index 91eebbe..77b15ad 100755 (executable)
--- a/verify-patches
+++ b/verify-patches
@@ -31,6 +31,7 @@ from inside the patches subdir.
 EOT
 }
 
+$ENV{'LC_COLLATE'} = 'C';
 $| = 1;
 my $CONF_OPTS = '-C';
 
@@ -198,7 +199,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 +208,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';
@@ -248,12 +247,12 @@ sub generate_new_patch
        print OUT $_;
     }
     close IN;
-    &filter_diff('diff --exclude-from=exclude -upr cvsdir workdir');
+    &filter_diff('diff --exclude-from=exclude -dupr cvsdir workdir');
     if ($prepare_source) {
        # These are not included in the diff above so that patch will give
        # generated files a later timestamp than the source files.
        foreach my $fn (@generated_files) {
-           &filter_diff("diff -up cvsdir/$fn workdir");
+           &filter_diff("diff -dup cvsdir/$fn workdir");
        }
     }
     close OUT;