sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0d565820b49dbeec4788fba53d45ac721f8e7492)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0d565820b49dbeec4788fba53d45ac721f8e7492)
- Date: Tue, 8 Apr 2014 04:35:44 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
database/mariadb/HISTORY | 3 +++
database/mariadb/UP_TRIGGERS | 22 +++++++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 0d565820b49dbeec4788fba53d45ac721f8e7492
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mariadb: update triggers for switching between branches
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 4bea901..07e78ce 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,6 @@
+2014-04-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: update triggers for switching between branches
+
2014-04-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PREPARE: added 5.5 branch
* CONFIGURE: renamed lists MADB_* -> MARIADB_*; added missing
charsets;
diff --git a/database/mariadb/UP_TRIGGERS b/database/mariadb/UP_TRIGGERS
index 000b21c..daf653e 100755
--- a/database/mariadb/UP_TRIGGERS
+++ b/database/mariadb/UP_TRIGGERS
@@ -1,14 +1,18 @@
-# up_trigger everything on update to 5.1.32 as most stuff links to
libmysqlclient.so.15 from version 5.0.77
+# up_trigger everything on branch updates
+local NEW_SPELL_BRANCH="" &&
+local OLD_SPELL_BRANCH="" &&
+
+if spell_ok $SPELL; then
+ NEW_SPELL_BRANCH="$(echo $VERSION | cut -d. -f1,2)" &&
+ OLD_SPELL_BRANCH="$(installed_version $SPELL | cut -d. -f1,2)" &&
+
+ if test "${NEW_SPELL_BRANCH}" != "${OLD_SPELL_BRANCH}"; then
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of
$SPELL..." &&
+ message "Figuring out what spells need to be recast, this may take a
while.${DEFAULT_COLOR}" &&
-local OLD_SPELL_VERSION=""
-if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
- message "This is a possibly incompatible update of libmysql..."
- message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL 1); do
- if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libmysqlclient.so.15"; then
+ if gaze -q install $each | xargs readelf -d 2> /dev/null |
+ grep -Eq "NEEDED.*libmysqlclient(_r)?.so"; then
up_trigger $each cast_self
fi
done
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0d565820b49dbeec4788fba53d45ac721f8e7492), Vlad Glagolev, 04/08/2014
Archive powered by MHonArc 2.6.24.