[LON-CAPA-cvs] cvs: loncom /build CHECKRPMS doc/loncapafiles loncapafiles.lpml picins_check.piml rpmcheck.piml

[raeburn]

raeburn		Sat Jul  6 19:20:36 2019 EDT

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml picins_check.piml rpmcheck.piml 
    /loncom/build	CHECKRPMS 
  Log:
  - Support Oracle Linux 6.
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.989 doc/loncapafiles/loncapafiles.lpml:1.990
--- doc/loncapafiles/loncapafiles.lpml:1.989	Tue Jul  2 19:40:13 2019
+++ doc/loncapafiles/loncapafiles.lpml	Sat Jul  6 19:20:31 2019
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.989 2019/07/02 19:40:13 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.990 2019/07/06 19:20:31 raeburn Exp $ -->
 
 <!--
 
@@ -280,9 +280,9 @@
   <description>configuration directory for password authentication mechanism
   </description>
 </directory>
-<directory dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 rhes4 rhes5 rhes6 rhes7 scientific5 scientific6 scientific7 centos5 centos6 centos7'>
+<directory dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 rhes4 rhes5 rhes6 rhes7 scientific5 scientific6 scientific7 centos5 centos6 centos7 oracle6'>
   <protectionlevel>never_delete</protectionlevel>
-  <targetdir dist='fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 rhes4 rhes5 rhes6 rhes7 scientific5 scientific6 scientific7 centos5 centos6 centos7'>etc/rc.d/init.d</targetdir>
+  <targetdir dist='fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 rhes4 rhes5 rhes6 rhes7 scientific5 scientific6 scientific7 centos5 centos6 centos7 oracle6'>etc/rc.d/init.d</targetdir>
   <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/init.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run during system startup</description>
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.40 doc/loncapafiles/picins_check.piml:1.41
--- doc/loncapafiles/picins_check.piml:1.40	Tue Jul  2 19:40:13 2019
+++ doc/loncapafiles/picins_check.piml	Sat Jul  6 19:20:32 2019
@@ -3,7 +3,7 @@
 <!-- picins_check.piml -->
 <!-- Stuart Raeburn -->
 
-<!-- $Id: picins_check.piml,v 1.40 2019/07/02 19:40:13 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.41 2019/07/06 19:20:32 raeburn Exp $ -->
 
 <!--
 
@@ -32,7 +32,7 @@
 <piml>
 <files>
 <file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora 23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes6 scientific6 centos6 rhes7 scientific7 centos7 oracle7 rhes8 centos8 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora 23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes6 scientific6 centos6 oracle6 rhes7 scientific7 centos7 oracle7 rhes8 centos8 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18">
     my $picinspath = '/usr/share/texmf/tex/latex/picins'; 
     my $file = 'picins.sty';
     if (!-e "$picinspath/$file") {
Index: doc/loncapafiles/rpmcheck.piml
diff -u doc/loncapafiles/rpmcheck.piml:1.45 doc/loncapafiles/rpmcheck.piml:1.46
--- doc/loncapafiles/rpmcheck.piml:1.45	Tue Jul  2 19:40:13 2019
+++ doc/loncapafiles/rpmcheck.piml	Sat Jul  6 19:20:32 2019
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.45 2019/07/02 19:40:13 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.46 2019/07/06 19:20:32 raeburn Exp $ -->
 
 <!--
 
@@ -81,7 +81,7 @@
     }
 }
 </perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes5 rhes6 rhes7 rhes8 centos5 scientific5 scientific6 centos6 scientific7 centos7 oracle7 centos8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes5 rhes6 rhes7 rhes8 centos5 scientific5 scientific6 centos6 oracle6 scientific7 centos7 oracle7 centos8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2" mode="fg">
 my $hasprereqs = 0;
 if (open(PIPE,"rpm -q LONCAPA-prerequisites|")) {
     my @lines = (<PIPE>);
Index: loncom/build/CHECKRPMS
diff -u loncom/build/CHECKRPMS:1.17 loncom/build/CHECKRPMS:1.18
--- loncom/build/CHECKRPMS:1.17	Sun Apr  9 14:54:02 2017
+++ loncom/build/CHECKRPMS	Sat Jul  6 19:20:36 2019
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Checks status of RPM packages on system.
 #
-# $Id: CHECKRPMS,v 1.17 2017/04/09 14:54:02 raeburn Exp $
+# $Id: CHECKRPMS,v 1.18 2019/07/06 19:20:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,7 @@
 
 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 10.2,10.3,11.1,11.2,11.3,11.4,sles11 - zypper 
@@ -139,11 +139,7 @@
         &prepare_msg($tmpfile,$cmd);
         ($send,$addsubj) = &check_with_yum($tmpfile);
     }
-} elsif ($distro =~ /^centos\d+$/) {
-    $cmd = 'yum update';
-    &prepare_msg($tmpfile,$cmd);
-    ($send,$addsubj) = &check_with_yum($tmpfile);
-} elsif ($distro =~ /^scientific\d+$/) {
+} elsif ($distro =~ /^(centos|scientific|oracle)\d+$/) {
     $cmd = 'yum update';
     &prepare_msg($tmpfile,$cmd);
     ($send,$addsubj) = &check_with_yum($tmpfile);