CVS: theedge/var/lib/lunar/functions install.lunar,1.16,1.17

sofar at lunar-linux.org sofar at lunar-linux.org
Thu Aug 14 20:25:52 GMT 2003


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

Modified Files:
	install.lunar 
Log Message:
re-enabling reports for succesfull resurrects, perhaps this needs a more elaborate rewrite, but it works for now. broken resurrects are not reported (as tchan says they werent in the past anyways).


Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- install.lunar	7 Aug 2003 23:52:02 -0000	1.16
+++ install.lunar	14 Aug 2003 20:25:49 -0000	1.17
@@ -279,12 +279,21 @@
   if [ -f "$CACHE_BZ" ] && bzip2 -tf $CACHE_BZ ; then
     message  "${RESURRECT_COLOR}Resurrecting ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR} ${MESSAGE_COLOR}version ${VERSION_COLOR}${VERSION}${DEFAULT_COLOR}"
     bzip2 -cd $CACHE_BZ | tar -Pkx 1>/dev/null 2>&1
-    add_module $MODULE $STATUS $VERSION
-    verbose_msg "running \"lunar fix $MODULE\""
-    run_fix $MODULE
-    activity_log  "lin"  "$MODULE"  "$VERSION"  "success"
-    message  "${RESURRECT_COLOR}Resurrected ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR} ${MESSAGE_COLOR}succesfully${DEFAULT_COLOR}"
+    add_module $MODULE $STATUS $VERSION &&
+    verbose_msg "running \"lunar fix $MODULE\"" &&
+    if run_fix $MODULE ; then
+      report $INSTALL_LOGS/$MODULE-$VERSION "install log" $MODULE $VERSION &&
+      sound SUCCESS
+      activity_log  "lin"  "$MODULE"  "$VERSION"  "success"  "resurrected"
+      message  "${RESURRECT_COLOR}Resurrected ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR} ${MESSAGE_COLOR}succesfully${DEFAULT_COLOR}"
+    else
+      sound FAILURE
+      activity_log  "lin"  "$MODULE"  "$VERSION"  "failed"  "resurrect failed"
+      false
+    fi
   else
+    sound FAILURE
+    activity_log  "lin"  "$MODULE"  "$VERSION"  "failed"  "resurrect failed"
     false
   fi
 )




More information about the Lunar-commits mailing list