Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Thomas Orgis (c42677de4c5321d09f0889a220deec1bafdd573d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Thomas Orgis (c42677de4c5321d09f0889a220deec1bafdd573d)
  • Date: Fri, 26 Feb 2021 11:32:19 +0000

GIT changes to master sorcery by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 2 ++
var/lib/sorcery/modules/libdepengine | 10 ++++++++++
2 files changed, 12 insertions(+)

New commits:
commit c42677de4c5321d09f0889a220deec1bafdd573d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libdepengine: more avoidance of casts after failures

diff --git a/ChangeLog b/ChangeLog
index 6cf9156..40bf8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@

2020-09-30 Thomas Orgis <sobukus AT sourcemage.org>
* libgrimoire: default to default size of tmpfs (half of RAM)
+ * libdepengine: avoid cast of spells whose dependencies failed,
+ also before the actual cast phase

2020-09-19 Thomas Orgis <sobukus AT sourcemage.org>
* protected: added readline, ncurses, isl, icu (bug 16112)
diff --git a/var/lib/sorcery/modules/libdepengine
b/var/lib/sorcery/modules/libdepengine
index 02e9b32..486fb63 100755
--- a/var/lib/sorcery/modules/libdepengine
+++ b/var/lib/sorcery/modules/libdepengine
@@ -135,10 +135,20 @@ depengine_cast_engine() {
rc=$?
fi

+ # Crude hacks to avoid casting spells whose dependencies failed.
+ # Since sorcery does not properly keep track of spell state with
+ # its multiple passes, some grepping in files that store failures
+ # does the trick.
if grep -qs "^$spell$" "$FAILED_LIST"; then
message "${MESSAGE_COLOR}The spell ${SPELL_COLOR}$spell$MESSAGE_COLOR" \
" failed to cast. Remembering that.$DEFAULT_COLOR"
rc=1
+ # pre_sub_depends failure is non-fatal, just means re-cast
+ elif grep -s "^$spell " "$CAST_BACKUPDIR/failure_reason_log" \
+ | grep -q -v pre_sub_depends; then
+ message "${MESSAGE_COLOR}The spell ${SPELL_COLOR}$spell$MESSAGE_COLOR" \
+ " failed before cast. Remembering that.$DEFAULT_COLOR"
+ rc=1
fi

dpgn_set_spell_color $spell brown



  • [SM-Commit] GIT changes to master sorcery by Thomas Orgis (c42677de4c5321d09f0889a220deec1bafdd573d), Thomas Orgis, 02/26/2021

Archive powered by MHonArc 2.6.24.

Top of Page