CVS: theedge/var/lib/lunar/functions install.lunar, 1.21, 1.22 main.lunar, 1.5, 1.6 moonbase.lunar, 1.12, 1.13

[Auke Kok]

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

Modified Files:
	install.lunar main.lunar moonbase.lunar 
Log Message:
Syncing some fixes:

 - compiler wrappers showed wrong compile call
 - get_moonbase breakage detection
 - cpan:// module installing native supported (need to commit example modules, please be patient)
 - autoresurrect logging disabled (too much noise in logs, especially with sound on).


Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- install.lunar	4 Oct 2003 20:19:43 -0000	1.21
+++ install.lunar	6 Nov 2003 22:29:39 -0000	1.22
@@ -42,10 +42,10 @@
   # gcc 3x please email your findings to
   # maintainer at lunar-linux.org.
 
+  eval $(grep PLATFORM= /etc/lunar/local/optimizations)
+
   # Usage check_checklist $MODULES
-  if [ -z "$PLATFORM" ] ; then
-    PLATFORM=x86
-  fi
+  PLATFORM=${PLATFORM:-x86}
   if [ -f /var/state/lunar/blacklist.$PLATFORM ] ; then
     BLKLST=$(grep ^$MODULE$ /var/state/lunar/blacklist.$PLATFORM)
     if [ "$BLKLST" == "$MODULE" ] ; then
@@ -295,8 +295,12 @@
       false
     fi
   else
-    sound FAILURE
-    activity_log  "lin"  "$MODULE"  "$VERSION"  "failed"  "resurrect failed"
+    # do not log an error in case we tried autoresurrect:
+    if [ "$AUTORESURRECT" == "off" -o -n "$COMPILE" ] ; then
+      sound FAILURE
+      activity_log  "lin"  "$MODULE"  "$VERSION"  "failed"  "resurrect failed"
+      false
+    fi
     false
   fi
 )

Index: main.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/main.lunar,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.lunar	16 Sep 2003 21:23:13 -0000	1.5
+++ main.lunar	6 Nov 2003 22:29:39 -0000	1.6
@@ -56,12 +56,13 @@
     return  1
   fi
 
-  lin moonbase
-  if (( $(lvu installed $LUNAR_MODULE) < $(lvu version $LUNAR_MODULE) )) 
-  then
-    lin $LUNAR_MODULE && lunar renew
-  else
-    lunar renew
+  if lin moonbase ; then
+    if (( $(lvu installed $LUNAR_MODULE) < $(lvu version $LUNAR_MODULE) )) 
+    then
+      lin $LUNAR_MODULE && lunar renew
+    else
+      lunar renew
+    fi
   fi
 
 }

Index: moonbase.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/moonbase.lunar,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- moonbase.lunar	4 Aug 2003 23:19:42 -0000	1.12
+++ moonbase.lunar	6 Nov 2003 22:29:39 -0000	1.13
@@ -74,6 +74,9 @@
     INFO="Could not download a fresh moonbase"
   fi
   activity_log "lin" "moonbase" "$VERSION" "$OUTCOME" "$INFO"
+  if [ "$OUTCOME" == "failed" ] ; then
+    return 1
+  fi
 )
 }