Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (b3dbc3258fb75329c30eec55bd2fe96a6e204576)

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 test-1.15 sorcery by Jaka Kranjc (b3dbc3258fb75329c30eec55bd2fe96a6e204576)
  • Date: Sat, 2 May 2015 14:47:44 -0500

GIT changes to test-1.15 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +++
var/lib/sorcery/modules/libresurrect | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)

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

libressurect: avoid conflict corner case #665

diff --git a/ChangeLog b/ChangeLog
index 6b85e00..a16071e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-05-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libressurect: avoid conflict corner case #665
+
2015-04-03 Thomas Orgis <sobukus AT sourcemage.org>
* build_api/common, libdepengine: Delete uncommitted depends files
only
after all spells are cast, preserving configuration for triggered
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 931ec62..3812183 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -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



  • [SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (b3dbc3258fb75329c30eec55bd2fe96a6e204576), Jaka Kranjc, 05/02/2015

Archive powered by MHonArc 2.6.24.

Top of Page