CVS: lunar/var/lib/lunar/functions depends.lunar,1.5,1.6

[elaine at lunar-linux.org]

Update of /var/cvs/lunar/lunar/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv8044

Modified Files:
	depends.lunar 
Log Message:
Mod opt-depends prompt to clarify function, indicate whether the quried
package is already present and split to 2 lines


Index: depends.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- depends.lunar	4 Oct 2003 20:13:35 -0000	1.5
+++ depends.lunar	2 Nov 2003 15:31:37 -0000	1.6
@@ -162,8 +162,14 @@
 	else
           DEFAULT="n"
         fi
-                                                                                
-	if query  "Install optional dependency $1 $4? " $DEFAULT ; then
+
+	if module_installed $1 ; then
+	  DEPMOD_AVAIL="Use ${MESSAGE_COLOR}(presently installed)${QUERY_COLOR}"
+	else
+	  DEPMOD_AVAIL="Install & use ${PROBLEM_COLOR}(not yet installed)${QUERY_COLOR}"
+	fi
+	if query  "$DEPMOD_AVAIL 
+        optional dependency $1 $4? " $DEFAULT ; then
           lin  --deps  $1
           add_depends  "$MODULE"  "$1"  "on"   "optional"  "$2"  "$3"
         else