~sourcemage/sorcery

b3dbc3258fb75329c30eec55bd2fe96a6e204576 — Jaka Kranjc 9 years ago 473f677
libressurect: avoid conflict corner case #665
2 files changed, 5 insertions(+), 2 deletions(-)

M ChangeLog
M var/lib/sorcery/modules/libresurrect
M ChangeLog => ChangeLog +3 -0
@@ 1,3 1,6 @@
2015-05-02 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
	* libressurect: avoid conflict corner case #665

2015-04-03 Thomas Orgis <sobukus@sourcemage.org>
	* build_api/common, libdepengine: Delete uncommitted depends files only
	  after all spells are cast, preserving configuration for triggered

M var/lib/sorcery/modules/libresurrect => var/lib/sorcery/modules/libresurrect +2 -2
@@ 287,9 287,9 @@ function resurrect_spell()  { (
  SCRIPT_DIRECTORY=$(codex_find_spell_by_name $SPELL)
  query_conflicts $SPELL "$conflicts"
  if [[ $? == 0 ]] && dispel_conflicts $SPELL "$conflicts"; then
    rm "$conflicts"
    sed -i "/^$SPELL /d" "$conflicts"
  else
    rm "$conflicts"
    sed -i "/^$SPELL /d" "$conflicts"
    resurrect_fail
    return 1
  fi