summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2011-06-06 17:41:05 -0700
committerGeorge Sherwood2011-06-12 10:40:39 -0500
commit3341212e4ea10c3869224607c5b52ee381c03e5d (patch)
tree1ea431fe12c05e75afb0b2dd34ba425fdf608918
parent25b844b02bb869d52244401d2ffbc4a5a7c9dc35 (diff)
libevent: Don't fail if libevent isn't already installed (Bug #15992)
Only check versions if libevent is installed (cherry picked from commit c47c919c656ff34e66bd1fba98966596362f5aa9)
-rw-r--r--libs/libevent/HISTORY4
-rwxr-xr-xlibs/libevent/UP_TRIGGERS4
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/libevent/HISTORY b/libs/libevent/HISTORY
index b0f294c7d1..632f9c772e 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,7 @@
+2011-06-06 Eric Sandall <sandalle@sourcemage.org>
+ * UP_TRIGGERS: Don't fail if libevent isn't already installed (Bug #15992)
+ Only check versions if libevent is installed
+
2011-04-30 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.0.11; corrected gpg sig url
* DEPENDS: added, for openssl optional dependency
diff --git a/libs/libevent/UP_TRIGGERS b/libs/libevent/UP_TRIGGERS
index f5b5446601..b8aa11601d 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)"
-if [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]]; then
+if spell_ok $SPELL && [[ "${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." &&