Skip to Content.
Sympa Menu

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

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 (b38df46514e1ca8500b8bdd5b1353220a74cbcae)
  • Date: Wed, 27 May 2009 13:04:14 -0500

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

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

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

libcast, libtriggers: made conflicts and triggers unsustaining #15226

aka another way for the spellwright to damage a system :)

diff --git a/ChangeLog b/ChangeLog
index 159949d..ff1af46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
* libtrack: made use of get_all_package_files in create_install_log
* libtrack: made real_track_manual work with whitespace and optimised
it #15240, patch by chp
+ * libcast, libtriggers: made conflicts and triggers unsustaining
#15226

2009-05-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* delve.8: added delve manpage based on the draft in #15094 by Donald
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index db56bb9..90ec070 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -140,7 +140,7 @@ function dispel_conflicts() {
fi

for spell in $(< $conflict_list); do
- dispel --noqueue $spell || return 1
+ dispel --nosustain --noqueue $spell || return 1
done
}

diff --git a/var/lib/sorcery/modules/libtriggers
b/var/lib/sorcery/modules/libtriggers
index 72a3a80..f665afd 100755
--- a/var/lib/sorcery/modules/libtriggers
+++ b/var/lib/sorcery/modules/libtriggers
@@ -196,7 +196,7 @@ function do_trigger () {
cast -c "${TRIGGER[0]}"
;;
dispel_self)
- dispel --noqueue "${TRIGGER[0]}"
+ dispel --noqueue --nosustain "${TRIGGER[0]}"
;;
check_self)
cleanse --nofix_quick "${TRIGGER[0]}" ||



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b38df46514e1ca8500b8bdd5b1353220a74cbcae), Jaka Kranjc, 05/27/2009

Archive powered by MHonArc 2.6.24.

Top of Page