Skip to Content.
Sympa Menu

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

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 (31bdaff856596d7dbd3ae525eba16a3b7f874776)
  • Date: Thu, 1 Mar 2007 22:25:21 -0600

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

ChangeLog | 8 ++++++++
var/lib/sorcery/modules/build_api/api2 | 8 +++++++-
var/lib/sorcery/modules/dl_handlers/dl_git | 4 ++++
var/lib/sorcery/modules/libtrack | 19 +++++++++++--------
4 files changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 31bdaff856596d7dbd3ae525eba16a3b7f874776
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed bug 13480 moving sanity check to a higher location and turning off
using castfs if it fails the sanity check

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

dl_handlers/dl_git fixed to use target when GIT_DIRECTORY is empty

diff --git a/ChangeLog b/ChangeLog
index 35a600a..57c7290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-28 David Brown <dmlb2000 AT gmail.com>
+ * dl_handler/dl_git: fixed to use $target and move to the appropriate
+ $target location
+ * libtrack: removed place where castfs sanity check was happening for
a
+ higher level location
+ * build_api/api2: put the castfs sanity check at a higher level, fixes
+ (bug #13480)
+
2007-02-27 David Brown <dmlb2000 AT gmail.com>
* libtrack: added sanity check function after castfs starts (bug
13480)

diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 831a025..70baf47 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -54,7 +54,7 @@ function run_build_spell() {
VOYEUR_STDOUT=/dev/null
VOYEUR_STDERR=/dev/null
fi
-
+
if [[ -z $STAGED_INSTALL ]]
then
if ! is_castfs_installed
@@ -65,6 +65,12 @@ function run_build_spell() {
fi
fi

+ if ! run_castfs_sanity
+ then
+ message "${PROBLEM_COLOR}CastFS failed sanity check turning
off${DEFAULT_COLOR}"
+ export STAGED_INSTALL=off
+ fi
+
local PROTECT_SORCERY=yes
local rs
(
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git
b/var/lib/sorcery/modules/dl_handlers/dl_git
index 38aadce..d6db216 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -36,6 +36,10 @@ function dl_git_get () {
for url in $url_list; do
local URL GIT_ROOT GIT_DIRECTORY GIT_TAG
url_crack "$url" "$hints"
+ if [[ -z $GIT_DIRECTORY ]]
+ then
+ GIT_DIRECTORY=${target/.git/}
+ fi
if test -d $GIT_DIRECTORY; then
message "${MESSAGE_COLOR}Running git pull...${DEFAULT_COLOR}"
( cd $GIT_DIRECTORY &&
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 10baede..d09b927 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -56,20 +56,28 @@ function real_track_manual() {
#--------------------------------------------------------------------
function run_castfs_sanity()
{
+ export CASTFS_LOGFILE=${CASTFS_DBGLOG}
+ export CASTFS_DBGLVL=${CASTFS_DEBUG_LEVEL}
+ debug "libtrack" "$FUNCNAME on $SPELL"
+ mkdir -p "${TMP_DIR}/test-mount" &&
+ mkdir -p "${TMP_DIR}/test-stage" &&
+ castfs "${TMP_DIR}/test-mount" -o "stage=${TMP_DIR}/test-stage" -o
"ignore=/tmp" &&
+ pushd "${TMP_DIR}/test-mount" > /dev/null &&
(
- debug "libtrack" "$FUNCNAME on $SPELL"
(echo stuff > foo) &&
(ls foo > /dev/null 2>&1) &&
(test "stuff" = "`cat foo`") &&
- rm foo
+ rm -f foo
)
local rc=$?
+ popd > /dev/null
if [[ $rc == 0 ]]
then
debug "libtrack" "$FUNCNAME success"
else
debug "libtrack" "$FUNCNAME failure"
fi
+ umount -l "${TMP_DIR}/test-mount"
return $rc
}

@@ -93,12 +101,7 @@ function real_invoke_stage_root()
for dir in /dev /dev/pts /proc /sys
do
mount -o bind "$dir" "${STAGE_DIRECTORY}/MOUNT$dir"
- done &&
- pushd "${STAGE_DIRECTORY}/MOUNT" > /dev/null &&
- run_castfs_sanity
- local rc=$?
- popd > /dev/null
- return $rc
+ done
}

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



  • [SM-Commit] GIT changes to master sorcery by David Brown (31bdaff856596d7dbd3ae525eba16a3b7f874776), David Brown, 03/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page