libdepengine: more avoidance of casts after failures

2 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6cf91561..40bf8b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 
 2020-09-30 Thomas Orgis <sobukus@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@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 02e9b329..486fb63c 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