[BACK]Return to CHECKRPMS CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/CHECKRPMS between versions 1.14 and 1.18

version 1.14, 2011/10/17 19:11:42 version 1.18, 2019/07/06 19:20:36
Line 42  to LON-CAPA systems. distprobe is used t Line 42  to LON-CAPA systems. distprobe is used t
   
 The utility which is used to complete the check depends on the distro:  The utility which is used to complete the check depends on the distro:
   
 fedora, rhel >= 5, centos, scientific - yum  fedora, rhel >= 5, centos, scientific, oracle linux - yum
   fedora >= 22 - dnf
 suse 9.X and sles9 - you  suse 9.X and sles9 - you
 suse 10.2,10.3,11.1,11.2,11.3,11.4,sles11 - zypper   suse 10.2,10.3,11.1,11.2,11.3,11.4,sles11 - zypper 
 sles10,suse10.1 - rug  sles10,suse10.1 - rug
Line 85  open(TMPFILE,">$tmpfile"); Line 86  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';      my $version =$1;
     &prepare_msg($tmpfile,$cmd);      if ($version > 21) {
     ($send,$addsubj) = &check_with_yum($tmpfile);          $cmd = 'dnf update';
           &prepare_msg($tmpfile,$cmd);
           ($send,$addsubj) = &check_with_dnf($tmpfile);
       } else {
           $cmd = 'yum update';
           &prepare_msg($tmpfile,$cmd);
           ($send,$addsubj) = &check_with_yum($tmpfile);
       }
 } elsif ($distro =~ /^(suse|sles)9\.?\d?$/) {  } elsif ($distro =~ /^(suse|sles)9\.?\d?$/) {
     $cmd = 'you';      $cmd = 'you';
     &prepare_msg($tmpfile,$cmd);      &prepare_msg($tmpfile,$cmd);
Line 125  if ($distro =~ /^fedora\d+$/) { Line 139  if ($distro =~ /^fedora\d+$/) {
         &prepare_msg($tmpfile,$cmd);          &prepare_msg($tmpfile,$cmd);
         ($send,$addsubj) = &check_with_yum($tmpfile);          ($send,$addsubj) = &check_with_yum($tmpfile);
     }      }
 } elsif ($distro =~ /^centos\d+$/) {  } elsif ($distro =~ /^(centos|scientific|oracle)\d+$/) {
     $cmd = 'yum update';  
     &prepare_msg($tmpfile,$cmd);  
     ($send,$addsubj) = &check_with_yum($tmpfile);  
 } elsif ($distro =~ /^scientific\d+$/) {  
     $cmd = 'yum update';      $cmd = 'yum update';
     &prepare_msg($tmpfile,$cmd);      &prepare_msg($tmpfile,$cmd);
     ($send,$addsubj) = &check_with_yum($tmpfile);      ($send,$addsubj) = &check_with_yum($tmpfile);
Line 145  if ($send) { Line 155  if ($send) {
     $subj .= $addsubj;      $subj .= $addsubj;
     if ($docroot ne '') {      if ($docroot ne '') {
         system("cat $tmpfile > $docroot/lon-status/checkrpms.txt");          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});
 }  }
Line 234  sub check_with_yum { Line 248  sub check_with_yum {
     }      }
     return ($sendflag,$append_to_subj);      return ($sendflag,$append_to_subj);
 }  }
   
   sub check_with_dnf {
       my ($tmpfile) = @_;
       my $dnf = '/usr/bin/dnf';
       my $sendflag = 0;
       my $append_to_subj;
   
       #
       # Execute dnf command
       my $command = $dnf.' check-update '.'>>'.$tmpfile;
       system($command);
   
       my $returnvalue = $?>>8;
   
       #
       # Determine status of dnf run
       if (100 == $returnvalue) {
           $sendflag = 1;
           $append_to_subj = ' RPMS to upgrade';
       } elsif (0 != $returnvalue) {
           $sendflag = 1;
           $append_to_subj = ' Error running RPM update script';
       } else {
           # dnf returned 0, so everything is up to date.
       }
       return ($sendflag,$append_to_subj);
   }
   
 sub check_with_up2date {  sub check_with_up2date {
     my ($tmpfile) = @_;      my ($tmpfile) = @_;
Removed from v.1.14  
changed lines
  Added in v.1.18

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