Changeset 3381

Timestamp:

09/23/99 00:01:40 (14 years ago)

Author:

frodo

Message:

Extra safety measures for mkpatch

It now dies with an error message if it fails to generate the correct diffs,
instead of continuing silently.

Files:

• i2c/trunk/mkpatch/mkpatch.pl (modified) (9 diffs)

i2c/trunk/mkpatch/mkpatch.pl

@@ -258 +258 @@
   close INPUT;
   close OUTPUT;
+  die "Automatic patch generation for `drivers/Makefile' failed.\n".
+      "Contact the authors please!" if $printed == 0;
   print_diff $package_root,$kernel_root,$kernel_file,$package_file;
 }
@@ -275 +277 @@
   my $i2c_present;
   my $printed = 0;
+  my $added = 0;
 
   open INPUT,"$kernel_root/$kernel_file"
@@ -282 +285 @@
   MAIN: while(<INPUT>) {
     if (m@^ALL_SUB_DIRS\s*:=@) {
+      $added = 1;
       $i2c_present = 0;
       while (m@\\$@) {
@@ -320 +324 @@
   close INPUT;
   close OUTPUT;
+  die "Automatic patch generation for `Makefile' failed.\n".
+      "Contact the authors please!" if $printed == 0 or $added == 0;
   print_diff $package_root,$kernel_root,$kernel_file,$package_file;
 }
@@ -383 +389 @@
   close INPUT;
   close OUTPUT;
+  die "Automatic patch generation for `drivers/char/Config.in' failed.\n".
+      "Contact the authors please!" if $printed == 0;
   print_diff $package_root,$kernel_root,$kernel_file,$package_file;
 }
@@ -403 +411 @@
   my $done = 0;
   my $atstart = 1;
+  my $pr1 = 0;
+  my $pr2 = 0;
 
   open INPUT,"$kernel_root/$kernel_file"
@@ -423 +433 @@
 EOF
       $atstart = 0;
+      $pr1 = 1;
     }
     while (not $right_place and (m@CONFIG_I2C@ or m@CONFIG_VIDEO_BT848@)) {
@@ -445 +456 @@
 EOF
       $done = 1;
+      $pr2 = 1;
     }
     print OUTPUT;
@@ -450 +462 @@
   close INPUT;
   close OUTPUT;
+  die "Automatic patch generation for `drivers/char/mem.c' failed.\n".
+      "Contact the authors please!" if $pr1 == 0 or $pr2 == 0;
   print_diff $package_root,$kernel_root,$kernel_file,$package_file;
 }