[LON-CAPA-cvs] cvs: loncom /build Makefile doc/loncapafiles buildfiles.lpml

[matthew]

matthew		Wed May 19 12:31:43 2004 EDT

  Modified files:              
    /doc/loncapafiles	buildfiles.lpml 
    /loncom/build	Makefile 
  Log:
  Adding rpmcheck.
  
  
Index: doc/loncapafiles/buildfiles.lpml
diff -u doc/loncapafiles/buildfiles.lpml:1.10 doc/loncapafiles/buildfiles.lpml:1.11
--- doc/loncapafiles/buildfiles.lpml:1.10	Wed May 19 12:05:38 2004
+++ doc/loncapafiles/buildfiles.lpml	Wed May 19 12:31:43 2004
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- buildfiles.lpml -->
 
-<!-- $Id: buildfiles.lpml,v 1.10 2004/05/19 16:05:38 matthew Exp $ -->
+<!-- $Id: buildfiles.lpml,v 1.11 2004/05/19 16:31:43 matthew Exp $ -->
 
 <!--
 
@@ -179,6 +179,16 @@
 <categoryname>system file</categoryname>
 <description>
 Checks server to determine status of ntpd.
+</description>
+<note>
+</note>
+</file>
+<file>
+<source>doc/loncapafiles/rpmcheck.piml</source>
+<target dist='default'>rpmcheck.piml</target>
+<categoryname>system file</categoryname>
+<description>
+Checks server for rpms known to conflict with LON-CAPA.
 </description>
 <note>
 </note>
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.158 loncom/build/Makefile:1.159
--- loncom/build/Makefile:1.158	Wed May 19 12:05:38 2004
+++ loncom/build/Makefile	Wed May 19 12:31:43 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.158 2004/05/19 16:05:38 matthew Exp $
+# $Id: Makefile,v 1.159 2004/05/19 16:31:43 matthew Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -120,6 +120,7 @@
 	@echo "sanitycheck: probe for common errors and recommend fixes to"
 	@echo "             the user"
 	@echo "ntpcheck: test to see if ntp is installed and running."
+	@echo "rpmcheck: test to see if rpms known to confict are installed."
 	@echo "updatequery: solicit the user for machine configuration"
 	@echo "             information; to be incorporated during an update"
 	@echo "             procedure (via the UPDATE command)"
@@ -387,6 +388,11 @@
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+rpmcheck:
+	cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 sanitycheck:
 	cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -426,6 +432,7 @@
 	make reseval_fixup
 	make accesscount_seed
 	make clearoutoldspreadsheetcache
+	make rpmcheck
 	make ntpcheck
 	make sanitycheck
 	make sendmail_fix