diff options
| author | Ismael Luceno | 2020-04-13 22:31:54 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2020-04-13 22:31:54 +0200 |
| commit | 8507bdab1a5c3b99c07da27c02c544322b24f4a1 (patch) | |
| tree | 2978209f820ca8207f4897c2a4fcc27b110acfd5 | |
| parent | f4ef5e8287b1a65aa0f38229af8f2b7b077cd74d (diff) | |
libresurrect: Fix warnings due to non-existing conflicts file
| -rwxr-xr-x | var/lib/sorcery/modules/libresurrect | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/var/lib/sorcery/modules/libresurrect b/var/lib/sorcery/modules/libresurrect index 984f7070..60c7fe49 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 |