Skip to Content.
Sympa Menu

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

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 (40a7469ff85bbe107ca6c0faee7cc4abeee9fac5)
  • Date: Tue, 2 Sep 2008 15:36:22 -0500

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

ChangeLog | 4 ++++
usr/sbin/cast | 5 ++---
var/lib/sorcery/modules/libdepends | 10 +++++++---
3 files changed, 13 insertions(+), 6 deletions(-)

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

* cast: when looking for dropped spells, also check the bad_spells
hash, since we're removing spells from to_cast when things go awry
* libdepends: only put the broken spell into the failed list, "drop"
the dependees and dependencies

diff --git a/ChangeLog b/ChangeLog
index 7ebed54..824e3df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2008-09-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* common, libmisc: moved the notice and failure log functions to
libmisc and added a check to log_failure_reason for being in cast
+ * cast: when looking for dropped spells, also check the bad_spells
+ hash, since we're removing spells from to_cast when things go awry
+ * libdepends: only put the broken spell into the failed list, "drop"
+ the dependees and dependencies

2008-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* cast, libspell, libsorcery, libcast, libsummon: fixed bug #2209
diff --git a/usr/sbin/cast b/usr/sbin/cast
index a9bc4f6..c705e19 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -672,9 +672,8 @@ function pass_five() {

local NOT_CAST
NOT_CAST=$( { hash_get_table_fields to_cast
- cat $SUCCESS_LIST
- cat $FAILED_LIST
- cat $CHECK_TRIGGERS_SUCCESS
+ hash_get_table_fields bad_spells
+ cat $SUCCESS_LIST $FAILED_LIST $CHECK_TRIGGERS_SUCCESS
} | sort | uniq -u ) # all not caught otherwise
if [[ "$NOT_CAST" ]] ;then
message "${DEFAULT_COLOR}" #being paranoid
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 21f0d72..5476e9b 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1623,7 +1623,7 @@ function private_remove_dependees()
message "${PROBLEM_COLOR}Removing dependees of
$SPELL_COLOR$spell$DEFAULT_COLOR"

# take care of the spell
- private_discard_spell $spell
+ private_discard_spell $spell fail

# take care of the dependees and their dependees and ...
recurse_remove_dependees() {
@@ -1677,11 +1677,15 @@ function private_remove_dependees()
function private_discard_spell()
{
local spell=$1
+ local failed=$2

grep -qs $spell $FAILED_LIST && return 0

- # spell is being removed from cast list, add to FAILED_LIST
- echo "$spell" >> $FAILED_LIST
+ if [[ $failed == fail ]]; then
+ # spell is being removed from cast list, add to FAILED_LIST
+ # the rest we want to just show up as dropped
+ echo "$spell" >> $FAILED_LIST
+ fi
hash_put depends_looked_at $spell failed
hash_unset "$CAST_HASH" "$spell"
hash_put $CANNOT_CAST_HASH "$spell" "Failed"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (40a7469ff85bbe107ca6c0faee7cc4abeee9fac5), Jaka Kranjc, 09/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page