INN commit: branches/2.5/scripts (inncheck.in)
INN Commit
rra at isc.org
Thu Jun 14 20:13:09 UTC 2012
Date: Thursday, June 14, 2012 @ 13:13:09
Author: iulius
Revision: 9425
inncheck: skip warning when expected .OLD backup files are found
Improve commit 9419 by allowing only expected .OLD backup files
(and not all files whose name ends with ".OLD").
Modified:
branches/2.5/scripts/inncheck.in
-------------+
inncheck.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Modified: inncheck.in
===================================================================
--- inncheck.in 2012-06-14 20:12:37 UTC (rev 9424)
+++ inncheck.in 2012-06-14 20:13:09 UTC (rev 9425)
@@ -1067,7 +1067,8 @@
return;
}
-## Return 1 if the Intersection of the files in the DIR and FILES is empty.
+## Return 1 if the intersection of the files in the $dir directory
+## and @files is empty.
## Otherwise, report an error for each illegal file, and return 0.
sub
intersect
@@ -1087,9 +1088,11 @@
if ( scalar(@in) ) {
foreach ( @files ) {
$dummy{$_}++;
+ # Also consider backup files as valid.
+ $dummy{"$_.OLD"}++;
}
foreach ( @in ) {
- if (not exists $dummy{$_} and $_ !~ /\.OLD$/) {
+ if (not exists $dummy{$_}) {
eprint "$pfx$dir:0: ERROR: illegal file `$_' in directory\n";
$i = 0;
}
More information about the inn-committers
mailing list