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 (24ed1d815ca351ef423fcf72c381bf9e5e48ab49)
- 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 (24ed1d815ca351ef423fcf72c381bf9e5e48ab49)
- Date: Sat, 10 Jun 2006 23:18:35 -0500
GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com>:
var/lib/sorcery/modules/build_api/api2 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 24ed1d815ca351ef423fcf72c381bf9e5e48ab49
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
updated to turn off stage root via the variable instead of adding the
extra check at key points for stage root
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 9dc7a64..6438962 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -48,7 +48,12 @@ function run_build_spell() {
VOYEUR_STDOUT=/dev/null
VOYEUR_STDERR=/dev/null
fi
-
+
+ if installwatch_is_stageable
+ then
+ INSTALL_WATCH=off
+ fi
+
local PROTECT_SORCERY=yes
local rs
(
@@ -61,7 +66,7 @@ # you have to make this directory every
# it's a bug with installwatch that it needs to exist at all times
prepare_stage_root &&
invoke_installwatch &&
- if [[ "$STAGED_INSTALL" != "off" ]] && installwatch_is_stageable
+ if [[ "$STAGED_INSTALL" != "off" ]]
then
invoke_stage_root
fi &&
@@ -266,7 +271,7 @@ ### Checks against STAGED_INSTALL and in
### accordingly
##--------------------------------------------------------------------
function run_stage_install() {
- if [[ "$STAGED_INSTALL" != "off" ]] && installwatch_is_stageable
+ if [[ "$STAGED_INSTALL" != "off" ]]
then
devoke_stage_root &&
install_staged_spell
- [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (24ed1d815ca351ef423fcf72c381bf9e5e48ab49), David Brown, 06/11/2006
Archive powered by MHonArc 2.6.24.