[Lunar-commits] CVS: theedge/var/lib/lunar/functions build.lunar, 1.25, 1.26 main.lunar, 1.20, 1.21 sources.lunar, 1.26, 1.27 tracking.lunar, 1.13, 1.14

[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:
	build.lunar main.lunar sources.lunar tracking.lunar 
Log Message:
deleting BOOST_LOCK from existance. Also adding lrm --upgrade to explicitly NOT run PRE_|POST_remove scripts since this causes deadlocks. lrm man page adjusted

Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- build.lunar	10 Dec 2004 10:46:33 -0000	1.25
+++ build.lunar	14 Dec 2004 15:05:06 -0000	1.26
@@ -109,16 +109,9 @@
   if  module_installed $MODULE  || module_held $MODULE ; then
     message  "${MESSAGE_COLOR}Preparing to install"  \
              "${MODULE_COLOR}${MODULE}${DEFAULT_COLOR}"
-
-    while  boost_locked;  do
-      sleep  5
-    done
-
-    echo  $$  >  $BOOST_LOCK
-
     save_libraries
-    verbose_msg "calling \"lrm --keepconfig --nosustain $MODULE\""
-    lrm  --keepconfig  --nosustain  $MODULE
+    verbose_msg "calling \"lrm --upgrade $MODULE\""
+    lrm --upgrade $MODULE
     true
   fi
   # turn on tracking now

Index: main.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/main.lunar,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- main.lunar	25 Nov 2004 15:05:53 -0000	1.20
+++ main.lunar	14 Dec 2004 15:05:06 -0000	1.21
@@ -308,8 +308,8 @@
       return 1
     fi  
 
-    if ! boost ; then
-      LIN_ERROR="boost"
+    if ! finish_install ; then
+      LIN_ERROR="POST_BUILD"
     else
       if ! run_post_install ; then
         LIN_ERROR="POST_INSTALL"

Index: sources.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/sources.lunar,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sources.lunar	25 Oct 2004 19:15:19 -0000	1.26
+++ sources.lunar	14 Dec 2004 15:05:06 -0000	1.27
@@ -281,8 +281,6 @@
   else
     rm -rf $DEAD_DIR 2> /dev/null
   fi
-
-  rm -f $BOOST_LOCK
 }
 
 

Index: tracking.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/tracking.lunar,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- tracking.lunar	25 Jun 2004 11:33:29 -0000	1.13
+++ tracking.lunar	14 Dec 2004 15:05:06 -0000	1.14
@@ -25,12 +25,6 @@
 ############################################################
 
 
-boost_locked() {
-  debug_msg "boost_locked ($@)"
-  [ -f $BOOST_LOCK ] && ps `cat $BOOST_LOCK` | grep -q lin
-}
-
-
 # function : invoke_installwatch
 # usage    : invoke_installwatch
 # purpose  : start logging all disk accesses with installwatch
@@ -125,8 +119,8 @@
 }
 
 
-boost()	{
-  debug_msg "boost ($@)"
+finish_install() {
+  debug_msg "finish_install ($@)"
 
   create_install_log    &&
   create_md5sum_log     &&
@@ -134,9 +128,6 @@
   
   add_module $MODULE installed $VERSION $(find_module_size $MODULE $VERSION)
   verbose_msg "module size is $(find_module_size $MODULE $VERSION)"
-
-  rm  -f  $BOOST_LOCK
-
 }