[Lunar-commits] CVS: theedge/sbin lin,1.73,1.74 lrm,1.19,1.20

[Auke Kok]

Update of /var/cvs/lunar/theedge/sbin
In directory dbguin.lunar-linux.org:/tmp/cvs-serv11821/sbin

Modified Files:
	lin lrm 
Log Message:
Fixes for:
- dependency sorting algorithm, completely rewritten from scratch, implemented using a depends.cache file which speeds up all dependency work immensely. The time needed to create the cache might still be a little long tho (2:30 uncached on my box). sorting time for entire moonbase is about 2:30 now, mostly spending in the fgrep. sorting time on 400 modules is < 30 seconds.
- double questions removed
- moonbase index creation is now more atomic than it was, it's generated in a tmpfile, then pivoted to the real location, same for depends.cache (crtl-c in the creation will not damage it)
- lrm fix that caused files in /boot to be deleted. as far as I can see this was still an TODO left open by kongar&&those-before-him (ouch). tested and works.
- added $DEPENDS_CACHE var in etc/lunar/config


Index: lin
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lin,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- lin	3 Mar 2004 21:51:07 -0000	1.73
+++ lin	7 Mar 2004 23:32:31 -0000	1.74
@@ -119,7 +119,7 @@
           linING="/var/lock/installing.$MODULE"
           if [ -n "$COMPILE" ] || [ -n "$RECONFIGURE" ] || module_installed $MODULE || ! resurrect $MODULE ; then
 	    verbose_msg "starting lin \"$MODULE\""
-            if ! SINGLE_MODULE=1 lin $DEPS_ONLY $RECONFIGURE $COMPILE $PROBE $SILENT $MODULE ; then
+            if ! SINGLE_MODULE=1 lin $COMPILE $PROBE $SILENT $MODULE ; then
               if [ -e "$TMP_LIN_FAIL" ] ; then
                 echo "$MODULE" >> $TMP_LIN_FAIL
               fi
@@ -143,6 +143,7 @@
   else
     # we are only doing one module, drop down to:
     MODULE=$MODULES
+    unset RECONFIGURE
 
     if [ -n "$MOD_VERSION" ] ; then
       if echo $MODULE | grep -q '/' ; then

Index: lrm
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lrm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- lrm	7 Aug 2003 05:56:48 -0000	1.19
+++ lrm	7 Mar 2004 23:32:31 -0000	1.20
@@ -14,6 +14,8 @@
 #                                                          #
 # Copyrighted Kagan Kongar 2002 under GPLv2                #
 #                                                          #
+# Copyrighted Auke Kok 2004 under GPLv2                    #
+#                                                          #
 ############################################################
 
 help() {
@@ -161,9 +163,12 @@
         continue
       fi
 
-      if grep -q -w "$TARGET\$" $PROTECTED $EXCLUDED ; then
+      if grep -q -x "$TARGET" $PROTECTED $EXCLUDED ; then
         verbose_msg "\"$TARGET\" is protected or excluded!!"
         continue
+      elif grep -q -x "$(dirname $TARGET)" $PROTECTED $EXCLUDED ; then
+        verbose_msg "\"$TARGET\" is in a protected or excluded directory!"
+	continue
       fi
 
       if [ -d "$TARGET" ] ; then