Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:

 usr/share/man/man8/dispel.8         |    5 +++--
 var/lib/sorcery/modules/libcast     |    3 ++-
 var/lib/sorcery/modules/libdispel   |    8 +++++---
 var/lib/sorcery/modules/libtriggers |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 49a11e32ed9d16d0f7a2403fa70e48250719ec5a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    slots: Pin sustain to installed instances, not spells

diff --git a/usr/share/man/man8/dispel.8 b/usr/share/man/man8/dispel.8
index 22214f7..492a868 100644
--- a/usr/share/man/man8/dispel.8
+++ b/usr/share/man/man8/dispel.8
@@ -138,8 +138,9 @@ left off, or spelled
 still has to pick out a single install.
 .PP
 .I /var/lib/sorcery/sustained
-is read the same way round: a bare spell name in it sustains every slot of
-that spell, as it always has, and naming an instance sustains just the one.
+names installs, and an install is one instance: a bare spell name in it is
+slot 0's, the name slot 0 goes by everywhere else, and every other slot is
+sustained by naming it there.
 .SH "FILES"
 .SS /var/lib/sorcery/excluded
 List of regexps that are excluded during a cast or dispel.
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 4832fd2..cc25486 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -678,7 +678,8 @@ acquire_cast_lock() {
           "Solo${DEFAULT_COLOR} ${MESSAGE_COLOR}casts to complete..." \
           "${DEFAULT_COLOR}"
   lock_resources "solo" "cast"
-  # SOLO reads spell-wide, like SUSTAINED, but one slot may be listed alone
+  # a solo build is solo whichever slot is being built, so SOLO reads
+  # spell-wide, though one slot may be listed alone
   if test -f $SOLO && grep -q -e "^$SPELL$" -e "^$instance$" $SOLO ||
      spell_is_solo
   then #SOLO spell
diff --git a/var/lib/sorcery/modules/libdispel 
b/var/lib/sorcery/modules/libdispel
index cf29119..07e1860 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -251,13 +251,15 @@ dispel_not_possible()  {
 #-----
 ## Does the sustained checks for spells
 ##
-## A bare spell name in $SUSTAINED sustains every slot of it, which is
-## what the file has always meant; naming an instance sustains the one.
+## $SUSTAINED names the installs the running system cannot lose, and an
+## install is one instance: a bare name there is slot 0's, the name it
+## goes by everywhere else, and the other slots are sustained by naming
+## them.
 #-----
 dispel_sustained()  {
 
   if  [  "$SUSTAIN"  ==  "on"  ]  &&
-      grep  -q  -e  "^$SPELL$"  -e  "^$SPELL_INSTANCE$"  $SUSTAINED
+      grep  -q  -e  "^$SPELL_INSTANCE$"  $SUSTAINED
   then
     message "${SPELL_COLOR}${SPELL_INSTANCE}${DEFAULT_COLOR}"     \
             "${PROBLEM_COLOR}is sustained${DEFAULT_COLOR}."
diff --git a/var/lib/sorcery/modules/libtriggers 
b/var/lib/sorcery/modules/libtriggers
index 1deb18e..a9504f7 100755
--- a/var/lib/sorcery/modules/libtriggers
+++ b/var/lib/sorcery/modules/libtriggers
@@ -91,7 +91,7 @@ trigger_split_row() {
 ##
 ## A trigger waits on a spell or on one slot of it, so casting an
 ## instance fires the rows that named the slot and the rows that did
-## not, the way $SUSTAINED reads a bare name as every slot.
+## not, the way $SOLO reads a bare name as every slot.
 ##
 #---------------------------------------------------------------------
 trigger()