Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (570a7bafda9d972d8531b4b5fb10059c725c5a33)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (570a7bafda9d972d8531b4b5fb10059c725c5a33)
  • Date: Tue, 27 Feb 2007 01:35:11 -0600

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 7 +++++++
var/lib/sorcery/build/run_compiler | 2 +-
var/lib/sorcery/modules/libtrack | 31 ++++++++++++++++++++++++++++++-
3 files changed, 38 insertions(+), 2 deletions(-)

New commits:
commit 570a7bafda9d972d8531b4b5fb10059c725c5a33
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

libtrack added sanity check function for castfs bug 13480

commit 955e70f993d49607d956d824a5ed58890393e5e6
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

run_compiler added a little self check so that is DISTCC_DIR isn't set it
will test / and succeed and not try to mkdir ''

diff --git a/ChangeLog b/ChangeLog
index 7d60ad3..35a600a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-27 David Brown <dmlb2000 AT gmail.com>
+ * libtrack: added sanity check function after castfs starts (bug
13480)
+
+2007-02-27 David Brown <dmlb2000 AT gmail.com>
+ * run_compiler: added a little self check so if DISTCC_DIR isn't set
+ it will succeed by checking / and not try to mkdir ''
+
2007-02-26 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* gaze: added PERL_URL from mirrors list to print in system-info

diff --git a/var/lib/sorcery/build/run_compiler
b/var/lib/sorcery/build/run_compiler
index b6a0edf..155cbe9 100644
--- a/var/lib/sorcery/build/run_compiler
+++ b/var/lib/sorcery/build/run_compiler
@@ -30,7 +30,7 @@ if [[ $USE_DISTCC != off ]] &&
export DISTCC_VERBOSE=0
export DISTCC_LOG=/dev/null

- test -d "$DISTCC_DIR" || mkdir -p "$DISTCC_DIR"
+ test -d "$DISTCC_DIR/" || mkdir -p "$DISTCC_DIR"
else
DISTCC=""
fi
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index c6e2169..10baede 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -49,6 +49,30 @@ function real_track_manual() {
return 0
}

+#--------------------------------------------------------------------
+## Some simple castfs sanity checking
+## make a file, check to see if it exists, check to see if the
+## contents of the file is what we made it
+#--------------------------------------------------------------------
+function run_castfs_sanity()
+{
+ (
+ debug "libtrack" "$FUNCNAME on $SPELL"
+ (echo stuff > foo) &&
+ (ls foo > /dev/null 2>&1) &&
+ (test "stuff" = "`cat foo`") &&
+ rm foo
+ )
+ local rc=$?
+ if [[ $rc == 0 ]]
+ then
+ debug "libtrack" "$FUNCNAME success"
+ else
+ debug "libtrack" "$FUNCNAME failure"
+ fi
+ return $rc
+}
+
#---------------------------------------------------------------------
##
## Starts Translation Stage Root
@@ -69,7 +93,12 @@ function real_invoke_stage_root()
for dir in /dev /dev/pts /proc /sys
do
mount -o bind "$dir" "${STAGE_DIRECTORY}/MOUNT$dir"
- done
+ done &&
+ pushd "${STAGE_DIRECTORY}/MOUNT" > /dev/null &&
+ run_castfs_sanity
+ local rc=$?
+ popd > /dev/null
+ return $rc
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master sorcery by David Brown (570a7bafda9d972d8531b4b5fb10059c725c5a33), David Brown, 02/27/2007

Archive powered by MHonArc 2.6.24.

Top of Page