Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.13 sorcery by Andrew Stitt

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andrew Stitt <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.13 sorcery by Andrew Stitt
  • Date: Sun, 28 May 2006 17:13:48 -0500

GIT changes to test-1.13 sorcery by Andrew Stitt <astitt AT sourcemage.org>:

ChangeLog | 3 +++
var/lib/sorcery/modules/libcast | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 6362399ff19259fc6e60e7365ab6ac34fcf6e791
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 11902, multi-spell conflicts
(cherry picked from f70b117c83926df0af3b134778c1bc13810c5ae2 commit)

diff --git a/ChangeLog b/ChangeLog
index 782bb45..23e56e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
+ * libcast: fix bug 11902, conflicts are broken for multi-spell
conflicts
+
2006-05-23 Andrew Stitt <astitt AT sourcemage.org>
* build: update to work with git

diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index db78792..c15355b 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -95,7 +95,7 @@ function run_conflicts() {

debug "build_api/common" "Starting run_conflicts() on $SPELL"
local ignore_conflict=$1
- local each
+ local each rc

if [ -x $SCRIPT_DIRECTORY/CONFLICTS ]; then
local CONFLICTS=$(
@@ -120,16 +120,16 @@ function run_conflicts() {
text="$text ${SPELL_COLOR}${spell_and_default[0]}${MESSAGE_COLOR}?"

if query "$text" ${spell_and_default[1]} ; then
- to_dispel="$to_dispel ${spell_and_default[0]}"
+ dispel ${spell_and_default[0]} || rc=1
echo ${spell_and_default[0]} >> $CONFLICT_LIST
else
echo $SPELL >> $FAILED_LIST
return 1
fi

- dispel $to_dispel
done
fi
+ return ${rc:-0}

}





Archive powered by MHonArc 2.6.24.

Top of Page