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

[Auke Kok]

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

Modified Files:
	depends.lunar 
Log Message:
Falling back to proper dependency tracking for sort_by_dependency, this makes it a bit slower but should now be a correct solution, which it really wasn't.


Index: depends.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- depends.lunar	9 Jan 2004 14:05:15 -0000	1.23
+++ depends.lunar	9 Jan 2004 15:16:12 -0000	1.24
@@ -71,12 +71,21 @@
   debug_msg "sort_by_dependency ($@)"
 
   recurse() {
+    depends () {
+      echo $1
+    }
+    optional_depends() {
+      # we really don't care about optional or not here
+      echo $1
+    }
     for MOD in $* ; do
-      LIST=$(grep ^$MOD: $DEPENDS_STATUS | grep ":on:" | cut -d: -f2)
-      for DEP in $LIST ; do
-        echo $MOD $DEP
-      done
-      recurse $LIST
+      LIST=$(run_module_file $MOD DEPENDS)
+      if [ -n "$LIST" ] ; then
+        for DEP in $LIST ; do
+	  echo $MOD $DEP
+	done
+        recurse $LIST
+      fi
     done
   }