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

[Auke Kok]

Author: sofar
Date: 2007-07-22 07:57:51 +0200 (Sun, 22 Jul 2007)
New Revision: 25218

Modified:
   lunar/trunk/var/lib/lunar/functions/depends.lunar
Log:
fast dependency resolution

From: toxicfrog at funkyhorror.net

While this patch doesn't speed up most dependency checking, it does
really well with *new* trees that need to be traversed.


Modified: lunar/trunk/var/lib/lunar/functions/depends.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/depends.lunar	2007-07-22 01:23:11 UTC (rev 25217)
+++ lunar/trunk/var/lib/lunar/functions/depends.lunar	2007-07-22 05:57:51 UTC (rev 25218)
@@ -163,7 +163,7 @@
     if module_installed $DEP ; then
       add_depends "$MODULE" "$DEP" "on" "required" "$2" "$3"
       echo "$DEP" >> $TEMP_PREPAREDDEPS
-    elif ! module_installed $DEP && ! module_held $DEP ; then
+    elif ! is_depends $DEP ! module_installed $DEP && ! module_held $DEP ; then
       if module_exiled $DEP ; then
         message "${MODULE_COLOR}${MODULE}:${PROBLEM_COLOR} ! Error: required dependency ${MODULE_COLOR}$DEP${DEFAULT_COLOR}${PROBLEM_COLOR} is exiled and cannot be installed${DEFAULT_COLOR}"
         return 1