sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by David Brown (d517e184909b980b606ccc4f271586d8688ddb42)
- From: David Brown <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master sorcery by David Brown (d517e184909b980b606ccc4f271586d8688ddb42)
- Date: Sat, 2 Dec 2006 13:48:04 -0600
GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:
usr/sbin/delve | 2 ++
var/lib/sorcery/modules/build_api/common | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit d517e184909b980b606ccc4f271586d8688ddb42
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
fix for when casting castfs during delve call so that delve can find
castfs in the old.binaries location
diff --git a/usr/sbin/delve b/usr/sbin/delve
index edbb8fe..9c65b8b 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -85,6 +85,8 @@ function delve_log_helper() {
OPTS="$OPTS $(get_depends_options $spell_depends $SPELL)"
fi
+ save_bin_lib_paths
+
# these have to go somewhere where future delves can find them
C_LOG=${C_LOG:="/tmp/sorcery/delve/$SPELL.compile.log"}
CASTFS_DBGLOG=${CASTFS_DBGLOG:="/tmp/sorcery/delve/$SPELL.iwdbglog"}
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 6cf3f54..3bc7a8f 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -130,7 +130,20 @@ function real_prepare_install() { (
dispel --notriggers --nosustain $SPELL
fi
-)
+) &&
+save_bin_lib_paths
+}
+
+#--------------------------------------------------------------------
+##
+## append old libraries and binaries to the appropriate environmental
+## variables so that they can be found by sorcery if they get
+## dispelled
+##
+#--------------------------------------------------------------------
+
+function save_bin_lib_paths()
+{
# TODO this is a dirty hack we need to remove it
if test -d "$SOURCE_DIRECTORY/old.binaries" ; then
for dir in $( find "$SOURCE_DIRECTORY/old.binaries" -type d); do
- [SM-Commit] GIT changes to master sorcery by David Brown (d517e184909b980b606ccc4f271586d8688ddb42), David Brown, 12/02/2006
Archive powered by MHonArc 2.6.24.