We now look for extra "patch -p1 <patches/FOO" commands instead
authorWayne Davison <wayned@samba.org>
Wed, 1 Nov 2006 21:33:37 +0000 (21:33 +0000)
committerWayne Davison <wayned@samba.org>
Wed, 1 Nov 2006 21:33:37 +0000 (21:33 +0000)
of looking for "Depends-On-Patch: FOO" lines.

verify-patches

index 1185bf4462d56bd2203caf045e4aae8921340839..4b76220320ebd354887cce6e8273b9c5110d0633 100755 (executable)
@@ -73,7 +73,7 @@ foreach my $diff (@ARGV) {
     open(IN, "patches/$diff") or die $!;
     while (<IN>) {
        last if /^--- /;
-       if (/^Depends-On-Patch: (\S+.diff)$/) {
+       if (m#^\s+patch -p1 <patches/(\S+.diff)# && $1 ne $diff) {
            my $dep = $1;
            $has_dependencies = 1;
            print "\nApplying dependency patch $dep...\n";