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 (50973fa57afdddce2914c21d96048069988ef146)
- 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 (50973fa57afdddce2914c21d96048069988ef146)
- Date: Sat, 10 Jun 2006 23:02:01 -0500
GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com>:
var/lib/sorcery/modules/build_api/api2 | 4 ++--
var/lib/sorcery/modules/libtrack | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 50973fa57afdddce2914c21d96048069988ef146
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
updated to add check for installwatch 6
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index a56948a..9dc7a64 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -61,7 +61,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" ]]
+ if [[ "$STAGED_INSTALL" != "off" ]] && installwatch_is_stageable
then
invoke_stage_root
fi &&
@@ -266,7 +266,7 @@ ### Checks against STAGED_INSTALL and in
### accordingly
##--------------------------------------------------------------------
function run_stage_install() {
- if [[ "$STAGED_INSTALL" != "off" ]]
+ if [[ "$STAGED_INSTALL" != "off" ]] && installwatch_is_stageable
then
devoke_stage_root &&
install_staged_spell
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 87fd441..8c8fd10 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -120,6 +120,16 @@ function real_devoke_installwatch() {
unset INSTW_EXCLUDE
}
+function installwatch_is_stageable()
+{
+ MINOR_VER="`installed_version installwatch | cut -d. -f2`"
+ if [[ $MINOR_VER == 7 ]]
+ then
+ return 0
+ else
+ return 1
+ fi
+}
#---------------------------------------------------------------------
##
- [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (50973fa57afdddce2914c21d96048069988ef146), David Brown, 06/11/2006
Archive powered by MHonArc 2.6.24.