INN commit: branches/2.5 (doc/pod/inncheck.pod scripts/inncheck.in)

[INN Commit]

    Date: Wednesday, August 10, 2011 @ 12:14:53
  Author: iulius
Revision: 9336

inncheck: allow to skip the check for certain files

Setting an empty value to a file to check permits to skip the actual
check.  It is useful for people who are not running all the programs shipped
with INN (for instance innfeed, in which case innfeed.conf is unnecessary).

Thanks to Florian Schlichting for the patch.

Modified:
  branches/2.5/doc/pod/inncheck.pod
  branches/2.5/scripts/inncheck.in

----------------------+
 doc/pod/inncheck.pod |    8 ++++++--
 scripts/inncheck.in  |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

Modified: doc/pod/inncheck.pod
===================================================================
--- doc/pod/inncheck.pod	2011-08-10 19:13:36 UTC (rev 9335)
+++ doc/pod/inncheck.pod	2011-08-10 19:14:53 UTC (rev 9336)
@@ -23,6 +23,9 @@
 C<incoming.conf=/tmp/incoming.conf> on the command line will cause
 B<inncheck> to only verify the F<incoming.conf> file, and it will perform
 the checks on the F</tmp/incoming.conf> file instead of the default one.
+Setting a file path to an empty value like C<incoming.conf=> will skip
+the check for that file (this only makes sense with B<-a>, or no files
+will be checked at all).
 
 Valid values for I<file> are:
 
@@ -118,9 +121,10 @@
     inncheck newsfeeds=/var/tmp/newsfeeds.testing
 
 To have B<inncheck> check all the files as it normally does, but to specify
-a different location for the F<newsfeeds> file, do:
+a different location for the F<newsfeeds> file and ommit checking of the
+F<innfeed.conf> file, do:
 
-    inncheck -a newsfeeds=/var/tmp/newsfeeds.testing
+    inncheck -a newsfeeds=/var/tmp/newsfeeds.testing innfeed.conf=
 
 =head1 BUGS
 

Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in	2011-08-10 19:13:36 UTC (rev 9335)
+++ scripts/inncheck.in	2011-08-10 19:14:53 UTC (rev 9336)
@@ -1230,6 +1230,7 @@
 
 action: foreach my $workfile ( @todo ) {
     $file = $paths{$workfile};
+    next action unless $file; # skip if set to empty value by user
     if ( ! -f $file ) {
 	eprint "$file:0: file missing\n";
 	next action;