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

[Auke Kok]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory espresso.foo-projects.org:/home/sofar/active/theedge/var/lib/lunar/functions

Modified Files:
	check.lunar 
Log Message:
Fix for AUTOFIX BREAKING MODULES: you can now use LDD_CHECK=off in DETAILS. please test && verify


Index: check.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/check.lunar,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- check.lunar	13 Mar 2005 17:08:31 -0000	1.19
+++ check.lunar	15 Mar 2005 16:49:37 -0000	1.20
@@ -323,16 +323,15 @@
     export_ld $EXPORT_LD_PATH
   fi
 
-  until  [  "$FIXED"     ==  "yes"  ]   ||
-         [  "$HOPELESS"  ==  "yes"  ];  do
-
-       FIXED="yes"
+  until [ "$FIXED" == "yes" ] || [ "$HOPELESS" == "yes" ] ; do
+    FIXED="yes"
     HOPELESS="no"
 
-    for  MODULE  in  $MODULES ;  do
+    for MODULE in $MODULES ; do
      # ENV separation required here!
      (
-      fix_depends $MODULE
+	  run_details $MODULE &&
+      fix_depends $MODULE &&
 
       # if we were called with --fixdepends then we may skip the rest
       if [ -n "$FIXDEPENDS" ] ; then
@@ -342,43 +341,38 @@
       if module_installed $MODULE                      &&
           [  "$MODULE"  !=  "lunar"  ]                 &&
           [  "$MODULE"  !=  "j2sdk"    ]               &&
-	  ! module_held $MODULE                        &&
+          ! module_held $MODULE                        &&
           !  echo  $PASSED  |  grep  -qw  "$MODULE";  then
 
-        if    run_checks     $MODULE  ||
-              [  -n  "$NOFIX"  ]
-        then
+        if run_checks $MODULE || [ -n "$NOFIX" ] ; then
           PASSED="$PASSED $MODULE"
         else
           FIXED="no"
-          (  
-	    run_details $MODULE  &&
-            satisfy_depends      &&
-            unset FIX            &&
-            satisfy_depends
-          )
+          satisfy_depends      &&
+          unset FIX            &&
+          satisfy_depends      &&
 
-          if  [  "$LDD_CHECK"  ==  "on"    ] ;  then
-            export  LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
+          if [ "$LDD_CHECK" == "on" ] ; then
+            export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
             export_ld $EXPORT_LD_PATH
           fi
 
-          if    run_checks     $MODULE  ||
-                [  -n  "$NOFIX"  ]
-          then
+          if run_checks $MODULE || [ -n "$NOFIX" ] ; then
 
             PASSED="$PASSED $MODULE"
-            if  [  "$LDD_CHECK"  ==  "on"    ] ;  then
-              export  LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
+            if [ "$LDD_CHECK" == "on" ] ; then
+              export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
               export_ld $EXPORT_LD_PATH 
             fi
 
           else
-            unset  FIX
-            if    !  lin  --compile  $MODULE;  then  HOPELESS="yes"
-            elif  !  run_checks      $MODULE;  then  HOPELESS="yes"
+            unset FIX
+            if ! lin --compile $MODULE ; then
+              HOPELESS="yes"
+            elif ! run_checks $MODULE ; then
+              HOPELESS="yes"
             fi
-            export  FIX="--fix"
+            export FIX="--fix"
           fi
         fi
       fi