Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1db27b7
)
Handle a patch failure where the whole patch was rejected.
author
Wayne Davison
<wayned@samba.org>
Tue, 28 Feb 2006 00:38:18 +0000
(
00:38
+0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 28 Feb 2006 00:38:18 +0000
(
00:38
+0000)
verify-patches
patch
|
blob
|
blame
|
history
diff --git
a/verify-patches
b/verify-patches
index
91eebbe
..
a7d0870
100755
(executable)
--- 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;
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 $_;
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, $_);
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;
} 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';
return 'D,E' if $saw_fuzz && !$failures_only;
return 'D,U,N' if $saw_offset && !$failures_only;
'N';