[Lunar-commits] r18147 - lunar/trunk/var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2006-01-16 17:53:28 +0000 (Mon, 16 Jan 2006)
New Revision: 18147

Modified:
   lunar/trunk/var/lib/lunar/functions/depends.lunar
Log:
layout changes:
- entire question is now yellow
  * except for the (is/isnot installed word)
  * and the description of the optional dependency
- highlighted installed dependency in green
- highlighted missing dependency in red
- reduced "not yet installed" to "not installed"
- reduced "already installed" to "installed"
- removed the word "dependency"

hope that cleans it up a bit.


Modified: lunar/trunk/var/lib/lunar/functions/depends.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/depends.lunar	2006-01-16 16:32:55 UTC (rev 18146)
+++ lunar/trunk/var/lib/lunar/functions/depends.lunar	2006-01-16 17:53:28 UTC (rev 18147)
@@ -203,9 +203,9 @@
         fi
 
 	if module_installed $DEP ; then
-	  DEPMOD_AVAIL="Use optional ${MESSAGE_COLOR}(presently installed) module${QUERY_COLOR} $DEP"
+	  DEPMOD_AVAIL="Use optional (${FILE_COLOR}installed${QUERY_COLOR}) module ${MODULE_COLOR}$DEP${DEFAULT_COLOR}${MESSAGE_COLOR}"
 	else
-	  DEPMOD_AVAIL="Install & use optional ${PROBLEM_COLOR}(not yet installed) ${MESSAGE_COLOR}module${QUERY_COLOR} $DEP"
+	  DEPMOD_AVAIL="Install & use optional (${PROBLEM_COLOR}not installed${QUERY_COLOR}) module ${MODULE_COLOR}$DEP${DEFAULT_COLOR}${MESSAGE_COLOR}"
 	fi
 
         # this is shortcut case s1) as discussed in lunar-dev ML
@@ -214,7 +214,7 @@
           add_depends  "$MODULE"  "$DEP"  "on"   "optional"  "$2"  "$3"
 	  lin --deps $DEP
 	elif query  "$DEPMOD_AVAIL 
-          dependency - purpose: $4? " $DEFAULT ; then
+          ${QUERY_COLOR}Purpose: ${DEFAULT_COLOR}${MESSAGE_COLOR}$4 ${QUERY_COLOR}?" $DEFAULT ; then
           add_depends  "$MODULE"  "$DEP"  "on"   "optional"  "$2"  "$3"
           lin --deps $DEP
         else