[Lunar-commits] CVS: theedge/var/lib/lunar/functions check.lunar, 1.14, 1.15

[Auke Kok]

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

Modified Files:
	check.lunar 
Log Message:
Fixing run_fix: it would fix only held modules. Also cleaned up quite a bit.


Index: check.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/check.lunar,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- check.lunar	7 Mar 2004 23:32:31 -0000	1.14
+++ check.lunar	26 Apr 2004 10:02:48 -0000	1.15
@@ -309,13 +309,11 @@
   MODULES=$*
 
   if [ -z "$MODULES" ] ; then
-    MODULES=$(cat $MODULE_STATUS_BACKUP | cut  -d: -f1 | sort)
+    MODULES=$(list_installed)
   fi
 
-  PASSED=":"
-
-  verbose_msg "Saving LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\""
-  [ -n "$EXPORT_LD_PATH" ] ||
+  if [ -z "$EXPORT_LD_PATH" ] ; then
+    verbose_msg "Saving LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\""
     export EXPORT_LD_PATH=$(find /usr/lib -type d ! -empty)
   if  [  "$LDD_CHECK"  ==  "on"    ] ;  then
     LD_LIBRARY_PATH_OLD="$LD_LIBRARY_PATH"
@@ -340,13 +338,13 @@
       if module_installed $MODULE                      &&
           [  "$MODULE"  !=  "lunar"  ]                 &&
           [  "$MODULE"  !=  "j2sdk"    ]               &&
-	  module_held $MODULE                          &&
-          !  echo  $PASSED  |  grep  -q  ":$MODULE:";  then
+	  ! module_held $MODULE                        &&
+          !  echo  $PASSED  |  grep  -qw  "$MODULE";  then
 
         if    run_checks     $MODULE  ||
               [  -n  "$NOFIX"  ]
         then
-          PASSED="$PASSED$MODULE:"
+          PASSED="$PASSED $MODULE"
         else
           FIXED="no"
           (  
@@ -365,7 +363,7 @@
                 [  -n  "$NOFIX"  ]
           then
 
-            PASSED="$PASSED$MODULE:"
+            PASSED="$PASSED $MODULE"
             if  [  "$LDD_CHECK"  ==  "on"    ] ;  then
               export  LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
               export_ld $EXPORT_LD_PATH 
@@ -382,7 +380,6 @@
       fi
     done
   done
-  rm  -f  /tmp/LD_LIBRARY_PATH_FILE
 }