Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7911ebc24f359950d0ad83076a03baf8ed4493e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7911ebc24f359950d0ad83076a03baf8ed4493e4)
  • Date: Thu, 4 Dec 2008 12:46:10 -0600

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 2 ++
usr/sbin/cast | 4 ++--
var/lib/sorcery/modules/dl_handlers/dl_git | 4 ++--
var/lib/sorcery/modules/dl_handlers/dl_hg | 6 +++---
4 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 7911ebc24f359950d0ad83076a03baf8ed4493e4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

dl_git, dl_hg: properly propagate errors, the chains were broken

commit 1dfd04aea32a01bb9fa3a80a3a7e28a69414913f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

cast: also save stderr in the download log, fixes #14661

diff --git a/ChangeLog b/ChangeLog
index c10f34d..6e15a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
slightly modified patch by Remko van der Vossen
* libgrimoire: fixed a slight security issue in real_rm_source_dir
#14100
* api2: bail out of run_pre_build if rm_source_dir fails
+ * cast: also save stderr in the download log, fixes #14661
+ * dl_git, dl_hg: properly propagate errors, the chains were broken

2008-12-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: improved what/short when dealing with multiple spells #14839
diff --git a/usr/sbin/cast b/usr/sbin/cast
index 48af4a5..39cafb8 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -534,10 +534,10 @@ function pass_three() {
fi

if [[ $SEPARATE ]] ; then
- summon_spell "$SPELL" >"$download_log"
+ summon_spell "$SPELL" &> "$download_log"
else
lock_file $download_log
- summon_spell "$SPELL" > "$download_log"
+ summon_spell "$SPELL" &> "$download_log"
unlock_file $download_log
fi

diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git
b/var/lib/sorcery/modules/dl_handlers/dl_git
index 3a8978d..e3ddd24 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -45,7 +45,7 @@ function dl_git_get () {
( cd $GIT_DIRECTORY &&
echo git checkout $GIT_TAG &&
git checkout $GIT_TAG &&
- echo git pull $GIT_ROOT $GIT_TAG
+ echo git pull $GIT_ROOT $GIT_TAG &&
git pull $GIT_ROOT $GIT_TAG )
rc=$?
eval "$dl_target=\"$GIT_DIRECTORY\""
@@ -54,7 +54,7 @@ function dl_git_get () {
echo git clone $GIT_ROOT $GIT_DIRECTORY
git clone $GIT_ROOT $GIT_DIRECTORY &&
cd $GIT_DIRECTORY &&
- echo git checkout $GIT_TAG
+ echo git checkout $GIT_TAG &&
git checkout $GIT_TAG &&
cd ../
rc=$?
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_hg
b/var/lib/sorcery/modules/dl_handlers/dl_hg
index 4a94bbd..68e3616 100644
--- a/var/lib/sorcery/modules/dl_handlers/dl_hg
+++ b/var/lib/sorcery/modules/dl_handlers/dl_hg
@@ -42,9 +42,9 @@ function dl_hg_get () {
if [[ -d $HG_DIRECTORY ]]; then
message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}"
( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT
+ echo hg pull $HG_ROOT &&
hg pull $HG_ROOT &&
- echo hg update $HG_TAG
+ echo hg update $HG_TAG &&
hg update $HG_TAG )
rc=$?
eval "$dl_target=\"$HG_DIRECTORY\""
@@ -53,7 +53,7 @@ function dl_hg_get () {
echo hg clone $HG_ROOT $HG_DIRECTORY
hg clone $HG_ROOT $HG_DIRECTORY &&
( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG
+ echo hg update $HG_TAG &&
hg update $HG_TAG )
rc=$?
eval "$dl_target=\"$HG_DIRECTORY\""



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7911ebc24f359950d0ad83076a03baf8ed4493e4), Jaka Kranjc, 12/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page