[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (8476f078cce027857ac5ed9df619d7ae34d748f5)

David Brown scm at mail.sourcemage.org
Sun Jun 11 00:56:52 EDT 2006


GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 at gmail.com>:

 usr/sbin/delve |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8476f078cce027857ac5ed9df619d7ae34d748f5
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    swapped invoke_installwatch to after the stage directory check... and added the devoke destroy and turning off stage install before running final

diff --git a/usr/sbin/delve b/usr/sbin/delve
index a121c3a..ea39525 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -156,11 +156,11 @@ function delve_install() {
 
   delve_is_valid_step BUILD 2 || return 1
   delve_log_helper
-  invoke_installwatch &&
   if [[ ! -d $STAGE_DIRECTORY ]]
   then
     prepare_stage_root
-  fi
+  fi &&
+  invoke_installwatch &&
   if [[ "$STAGED_INSTALL" != "off" ]]
   then
     invoke_stage_root
@@ -211,6 +211,9 @@ function delve_final() {
   debug "delve" "Running $FUNCNAME"
   delve_is_valid_step BUILD 2 || return 1
   delve_log_helper
+  devoke_installwatch &&
+  destroy_stage_root &&
+  STAGED_INSTALL=off
   (
     run_final
   ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \



More information about the SM-Commit mailing list