CVS: lunar/var/lib/lunar/functions main.lunar, 1.3, 1.4 moonbase.lunar, 1.4, 1.5

[Auke Kok]

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

Modified Files:
	main.lunar moonbase.lunar 
Log Message:
I was under the impression that I had committed these fixes already before I was AFK. But anyway, here's a proposed fix for when a moonbase lin crashes...


Index: main.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/main.lunar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- main.lunar	16 Sep 2003 21:21:23 -0000	1.3
+++ main.lunar	26 Oct 2003 14:16:46 -0000	1.4
@@ -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/lunar/var/lib/lunar/functions/moonbase.lunar,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- moonbase.lunar	10 Aug 2003 01:16:22 -0000	1.4
+++ moonbase.lunar	26 Oct 2003 14:16:46 -0000	1.5
@@ -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
 )
 }