[Lunar-commits] CVS: theedge/var/lib/lunar/functions depends.lunar, 1.32, 1.33

[Auke Kok]

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

Modified Files:
	depends.lunar 
Log Message:
Fixing the double-asking bug! theedge is now ready for 1.4.0 !!!


Index: depends.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- depends.lunar	8 Mar 2004 21:54:08 -0000	1.32
+++ depends.lunar	9 Mar 2004 09:53:08 -0000	1.33
@@ -125,9 +125,9 @@
 add_depends() {
   debug_msg "add_depends ($@)"
   if ! grep -q "^$1:$2:$3:$4:$5:$6$" $DEPENDS_STATUS ; then
-	  if grep -q "^$1:$2:" $DEPENDS_STATUS ; then
-		  remove_depends "$1" "$2"
-		fi
+    if grep -q "^$1:$2:" $DEPENDS_STATUS ; then
+      remove_depends "$1" "$2"
+    fi
                                                                                 
     verbose_msg "adding \"$4\" depends for \"$1\" on \"$2\" ($3)"
                                                                                 
@@ -145,7 +145,7 @@
   debug_msg "run_depends ($@)"
   # local definitions of depends and optional_depends!
   depends()  {
-  debug_msg "  depends ($@)"
+    debug_msg "  depends ($@)"
     grep -q "^"$1"\$" $TEMP_PREPAREDDEPS 2>/dev/null && return 0
 
     if ! module_installed $1 && ! module_held $1 ; then
@@ -156,11 +156,11 @@
         message "${MODULE_COLOR}${MODULE}: ${DEFAULT_COLOR}" \
                 "Adding required dependency${FILE_COLOR}"   \
                 "$1 ${DEFAULT_COLOR}"
+        add_depends "$MODULE" "$1" "on" "required" "$2" "$3"
         lin --deps $1
         echo "$1" >> $TEMP_PREPAREDDEPS
       fi
     fi
-    add_depends "$MODULE" "$1" "on" "required" "$2" "$3"
   }
                                                                                 
   optional_depends()  {
@@ -189,10 +189,10 @@
 	fi
 	if query  "$DEPMOD_AVAIL 
         dependency - purpose: $4? " $DEFAULT ; then
-          lin  --deps  $1
           add_depends  "$MODULE"  "$1"  "on"   "optional"  "$2"  "$3"
+          lin --deps $1
         else
-	  add_depends  "$MODULE"  "$1"  "off"  "optional"  "$2"  "$3"
+          add_depends  "$MODULE"  "$1"  "off"  "optional"  "$2"  "$3"
 	fi
       fi
     fi