Diff for /loncom/build/CHECKRPMS between versions 1.13 and 1.16

version 1.13, 2011/05/13 00:21:45 version 1.16, 2011/12/08 17:22:37
Line 63  use Apache::loncommon(); Line 63  use Apache::loncommon();
   
 my $tmpfile = '/tmp/CHECKRPMS.'.$$;  my $tmpfile = '/tmp/CHECKRPMS.'.$$;
 my $perlvar= LONCAPA::Configuration::read_conf('loncapa.conf');  my $perlvar= LONCAPA::Configuration::read_conf('loncapa.conf');
   my $docroot = $perlvar->{'lonDocRoot'};
   
 # Determine who we email  # Determine who we email
 my $defdom = $perlvar->{'lonDefDomain'};  my $defdom = $perlvar->{'lonDefDomain'};
Line 84  open(TMPFILE,">$tmpfile"); Line 85  open(TMPFILE,">$tmpfile");
 print TMPFILE localtime(time).'    '.$hostname."\n";  print TMPFILE localtime(time).'    '.$hostname."\n";
 close(TMPFILE);  close(TMPFILE);
   
   if ($docroot ne '') {
       if (-e "$docroot/lon-status/checkrpms.txt") {
           unlink("$docroot/lon-status/checkrpms.txt");
       }
   }
   
 my ($cmd,$send,$addsubj);  my ($cmd,$send,$addsubj);
 if ($distro =~ /^fedora\d+$/) {  if ($distro =~ /^fedora\d+$/) {
     $cmd = 'yum update';      $cmd = 'yum update';
Line 142  if ($distro =~ /^fedora\d+$/) { Line 149  if ($distro =~ /^fedora\d+$/) {
 }  }
 if ($send) {  if ($send) {
     $subj .= $addsubj;      $subj .= $addsubj;
       if ($docroot ne '') {
           system("cat $tmpfile > $docroot/lon-status/checkrpms.txt");
           if ($< == 0) {
               system("chown www:www $docroot/lon-status/checkrpms.txt");
           }
           chmod(0600,"$docroot/lon-status/checkrpms.txt");
       }
     system(qq{mail -s '$subj' "$emailto" < $tmpfile});      system(qq{mail -s '$subj' "$emailto" < $tmpfile});
 }  }
   

Removed from v.1.13  
changed lines
  Added in v.1.16


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>