summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2012-06-09 12:45:30 +0400
committerVlad Glagolev2012-06-14 12:36:13 +0400
commit1892ed57d844f2b42db685af8622e320b9c21c2f (patch)
treefbb89f6407464b69dbcedae6c9c28702f2f79132
parent28441294cda4f3c5b2a62d6cb0994e68e934b572 (diff)
libevent: corrected UP_TRIGGERS
(cherry picked from commit 050389e4f6d83d8cf3f776e2c4b3496819a4c567)
-rw-r--r--libs/libevent/HISTORY3
-rwxr-xr-xlibs/libevent/UP_TRIGGERS4
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/libevent/HISTORY b/libs/libevent/HISTORY
index bceaf8e0eb..38426e6bbb 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Vlad Glagolev <stealth@sourcemage.org>
+ * UP_TRIGGERS: don't compare when spell isn't installed
+
2012-06-02 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.0.19
diff --git a/libs/libevent/UP_TRIGGERS b/libs/libevent/UP_TRIGGERS
index b8aa11601d..4ef15ef620 100755
--- a/libs/libevent/UP_TRIGGERS
+++ b/libs/libevent/UP_TRIGGERS
@@ -1,8 +1,8 @@
# up_trigger everything on major version updates
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" || return 0
-if spell_ok $SPELL && [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]]; then
+if [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a while." &&