sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (3f56f0ffb2650090878e69072f20e90830b6cf39)
- From: David Brown <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (3f56f0ffb2650090878e69072f20e90830b6cf39)
- Date: Mon, 12 Jun 2006 20:50:24 -0500
GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com>:
usr/sbin/delve | 1 -
var/lib/sorcery/modules/build_api/api2 | 1 -
var/lib/sorcery/modules/build_api/common | 6 +++++-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 3f56f0ffb2650090878e69072f20e90830b6cf39
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
updated to remove stage directory on spell success instead of right after
its use
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 58aa788..378397b 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -212,7 +212,6 @@ function delve_final() {
delve_is_valid_step BUILD 2 || return 1
delve_log_helper
devoke_installwatch &&
- destroy_stage_root &&
STAGED_INSTALL=off
(
run_final
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index bf5093d..abf8855 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -75,7 +75,6 @@ # it's a bug with installwatch that it n
delve $SPELL POST_INSTALL || return 2
run_stage_install &&
devoke_installwatch &&
- destroy_stage_root &&
STAGED_INSTALL=off &&
run_final || return 3
) 2> >(tee -a $C_LOG 1>&2 >> $VOYEUR_STDERR) \
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 530b728..dd5f1d9 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -283,6 +283,10 @@ function run_spell_success() {
# do this before cache archive creation (bug 8249)
rm_source_dir
+ if [[ $STAGED_INSTALL != off ]]
+ then
+ destroy_stage_root
+ fi
# cache archive
@@ -334,6 +338,6 @@ function run_spell_failure() {
get_uncommitted_rsub_depends_file $SPELL spell_rsub_depends
rm -f "$spell_sub_depends" "$spell_rsub_depends"
- [[ $CLEAN_SOURCE == on ]] && rm_source_dir
+ [[ $CLEAN_SOURCE == on ]] && rm_source_dir && destroy_stage_root
CAST_EXIT_STATUS=1
}
- [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (3f56f0ffb2650090878e69072f20e90830b6cf39), David Brown, 06/12/2006
Archive powered by MHonArc 2.6.24.