Skip to Content.
Please activate JavaScript in your web browser
List archive
[SM-Commit] GIT changes to master sorcery by Ismael Luceno (8507bdab1a5c3b99c07da27c02c544322b24f4a1)
Chronological
Thread
<
Chronological
>
<
Thread
>
From
: Ismael Luceno <scm AT sourcemage.org>
To
: sm-commit AT lists.ibiblio.org
Subject
: [SM-Commit] GIT changes to master sorcery by Ismael Luceno (8507bdab1a5c3b99c07da27c02c544322b24f4a1)
Date
: Mon, 13 Apr 2020 20:32:02 +0000
GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:
var/lib/sorcery/modules/libresurrect | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 8507bdab1a5c3b99c07da27c02c544322b24f4a1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libresurrect: Fix warnings due to non-existing conflicts file
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 984f707..60c7fe4 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -286,10 +286,11 @@ resurrect_spell() { (
local tmp="$SCRIPT_DIRECTORY"
SCRIPT_DIRECTORY=$(codex_find_spell_by_name $SPELL)
query_conflicts $SPELL "$conflicts"
- if [[ $? == 0 ]] && dispel_conflicts $SPELL "$conflicts"; then
- sed -i "/^$SPELL /d" "$conflicts"
- else
+ local rc=$?
+ if [ -f "$conflicts" ]; then
sed -i "/^$SPELL /d" "$conflicts"
+ fi
+ if [ 0 != "$rc" ] || ! dispel_conflicts "$SPELL" "$conflicts"; then
resurrect_fail
return 1
fi
[SM-Commit] GIT changes to master sorcery by Ismael Luceno (8507bdab1a5c3b99c07da27c02c544322b24f4a1)
,
Ismael Luceno, 04/13/2020
Archive powered by
MHonArc 2.6.24
.