Skip to Content.
Sympa Menu

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

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 (18e48630520c1ea881cf6b2af3f4d13a9d6ebba6)
  • Date: Mon, 21 Jul 2008 14:03:33 -0500

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

ChangeLog | 3 +++
var/lib/sorcery/modules/libdispel | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 18e48630520c1ea881cf6b2af3f4d13a9d6ebba6
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libdispel: never fail when trying to remove the spell from the queue

diff --git a/ChangeLog b/ChangeLog
index 9e3b909..e801395 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-07-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdispel: never fail when trying to remove the spell from the queue
+
2008-07-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libunpack: fixed the case in three messages
* libtrack: fixed the case in two messages
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index efc9c11..c9d5042 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -338,7 +338,7 @@ function dispel_spell() {
remove_version_cache "$VERSION_STATUS" $SPELL &&
{ [[ $TRIGGER == off ]] || trigger "dispel";} &&
remove_triggers $SPELL &&
- { [[ $DEQUEUE == off ]] || pop_install_queue $SPELL; } &&
+ { [[ $DEQUEUE == off ]] || pop_install_queue $SPELL; true; } &&
message "${DISPEL_COLOR}Dispelled spell:" \
"${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" &&
activity_log "dispel" "$SPELL" "$VERSION" "success"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (18e48630520c1ea881cf6b2af3f4d13a9d6ebba6), Jaka Kranjc, 07/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page