[LON-CAPA-cvs] cvs: doc /loncapafiles sanitycheck.piml loncom/lonnet/perl lonnet.pm

matthew lon-capa-cvs@mail.lon-capa.org
Wed, 27 Nov 2002 15:33:10 -0000


matthew		Wed Nov 27 10:33:10 2002 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
    /doc/loncapafiles	sanitycheck.piml 
  Log:
  Skip lines in hosts.tab which begin with # or are only whitespace.  This 
  commit cleans up the WARNINGS file which is generated on 'make install' and
  uses the exact same regular expression to test in sanitycheck.piml as
  lonnet.pm.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.302 loncom/lonnet/perl/lonnet.pm:1.303
--- loncom/lonnet/perl/lonnet.pm:1.302	Fri Nov 22 13:07:14 2002
+++ loncom/lonnet/perl/lonnet.pm	Wed Nov 27 10:33:10 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.302 2002/11/22 18:07:14 albertel Exp $
+# $Id: lonnet.pm,v 1.303 2002/11/27 15:33:10 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3473,6 +3473,7 @@
     my $config=Apache::File->new("$perlvar{'lonTabDir'}/hosts.tab");
 
     while (my $configline=<$config>) {
+       next if ($configline =~ /^(\#|\s*$)/);
        chomp($configline);
        my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline);
        if ($id && $domain && $role && $name && $ip) {
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.9 doc/loncapafiles/sanitycheck.piml:1.10
--- doc/loncapafiles/sanitycheck.piml:1.9	Tue Nov 26 10:05:19 2002
+++ doc/loncapafiles/sanitycheck.piml	Wed Nov 27 10:33:10 2002
@@ -3,7 +3,7 @@
 <!-- sanitycheck.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: sanitycheck.piml,v 1.9 2002/11/26 15:05:19 matthew Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.10 2002/11/27 15:33:10 matthew Exp $ -->
 
 <!--
 
@@ -123,6 +123,7 @@
 my $sbug=0;
 my $fbug=0;
 while (&lt;IN&gt;) {
+ next if (/^(\#|\s*$)/);
  if (/\S/) {
   $rbug=1 if /\r/;
   my @a=split(/\:/,$_);