Source Mage code commit list

[scm AT mail.sourcemage.org]

GIT changes to devel sorcery by  <>:

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

New commits:
commit 62f6eddbae2f12212546c33989e597d90e885b49
Merge: 6ee1f91... f70b117...
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

    Merge branch '11902'

commit f70b117c83926df0af3b134778c1bc13810c5ae2
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

    fix bug 11902, multi-spell conflicts

diff --git a/ChangeLog b/ChangeLog
index da93174..f733a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
+       * libcast: fix bug 11902, conflicts are broken for multi-spell 
conflicts
+
+2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
        * cast, sorcery, man8/cast.8, libcast, libsorcery: add cppflags 
option,
          bug 12327, patch from Thomas Orgis.
 
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 2bf879c..52c56f4 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}
 
 }