--- loncom/loncron 2013/02/02 14:42:01 1.97 +++ loncom/loncron 2013/02/08 14:49:51 1.98 @@ -2,7 +2,7 @@ # Housekeeping program, started by cron, loncontrol and loncron.pl # -# $Id: loncron,v 1.97 2013/02/02 14:42:01 raeburn Exp $ +# $Id: loncron,v 1.98 2013/02/08 14:49:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -271,7 +271,7 @@ sub log_machine_info { &log($fh,"
"); - &get_distro($perlvar{'lonDaemons'},$fh); + &log($fh,&encode_entities(&LONCAPA::distro(),'<>&"')); &log($fh,""); &errout($fh); @@ -752,7 +752,7 @@ sub write_serverhomeIDs { } sub write_checksums { - my $distro = &get_distro($perlvar{'lonDaemons'}); + my $distro = &LONCAPA::distro(); if ($distro) { print "Retrieving file version and checksumming.\n"; my $numchksums = 0; @@ -788,21 +788,6 @@ sub send_mail { } } -sub get_distro { - my ($dir,$fh) = @_; - my $distro; - if (open(my $disth,"$dir/distprobe |")) { - while (my $line=<$disth>) { - if ($fh) { - &log($fh,&encode_entities($line,'<>&"')); - } - $distro .= $line; - } - close($disth); - } - return $distro; -} - sub usage { print(<