summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2012-06-09 02:39:56 +0200
committerVlad Glagolev2012-06-14 12:35:39 +0400
commitf410aa91c1defa65988f8db3c177d7fb797d2e5c (patch)
treee021367b8d3be21c5b866214822fb2995ae1d89f
parentf75b5eb3aa2de6a9be399a348860d858cde18dff (diff)
libxfce4util: UP_TRIGGERS fixed
if libxfce4util is installed for the first time: libxfce4util checking for reverse triggers... Removing dependees of libxfce4util No spells to cast! Cannot cast these spells: --------------------------- libxfce4util (up_triggers) (cherry picked from commit 387eb588640f3592c68c37b32cd635f14fd0dfb3)
-rw-r--r--xfce/libxfce4util/HISTORY3
-rwxr-xr-xxfce/libxfce4util/UP_TRIGGERS7
2 files changed, 8 insertions, 2 deletions
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index a45cca72ae..52ff928e1b 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Ladislav Hagara <hgr@vabo.cz>
+ * UP_TRIGGERS: fixed
+
2012-05-25 Vlad Glagolev <stealth@sourcemage.org>
* UP_TRIGGER: added, for proper upgrade
diff --git a/xfce/libxfce4util/UP_TRIGGERS b/xfce/libxfce4util/UP_TRIGGERS
index 2b8c75e6f2..ff7732c9dd 100755
--- a/xfce/libxfce4util/UP_TRIGGERS
+++ b/xfce/libxfce4util/UP_TRIGGERS
@@ -1,7 +1,9 @@
# recast everything on minor version update
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
-if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a while." &&
@@ -11,4 +13,5 @@ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
up_trigger $each cast_self
fi
done
+ fi
fi