summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Riosa <vivo@gentoo.org>2006-03-10 11:41:39 +0000
committerFrancesco Riosa <vivo@gentoo.org>2006-03-10 11:41:39 +0000
commit3dfa1992234759c7a7e0cb16006e2a411f835fa8 (patch)
treeac28898e2f7583de7d3bc829259127dfc693801e /eclass/mysql.eclass
parentStable on arm; bug #125217 (diff)
downloadgentoo-2-3dfa1992234759c7a7e0cb16006e2a411f835fa8.tar.gz
gentoo-2-3dfa1992234759c7a7e0cb16006e2a411f835fa8.tar.bz2
gentoo-2-3dfa1992234759c7a7e0cb16006e2a411f835fa8.zip
re-add symlinking of libraryes for un-slotted (screwed before)
Diffstat (limited to 'eclass/mysql.eclass')
-rw-r--r--eclass/mysql.eclass10
1 files changed, 8 insertions, 2 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 5d4267d04ec1..2f493df9bbdf 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.23 2006/03/09 12:37:01 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.24 2006/03/10 11:41:39 vivo Exp $
# Author: Francesco Riosa <vivo at gentoo.org>
# Maintainer: Francesco Riosa <vivo at gentoo.org>
@@ -520,6 +520,10 @@ mysql_src_install() {
echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
popd &>/dev/null
fi
+
+ # It's safer portage wis doing this in instal, but we can't
+ # if it's a slotted install
+ [[ ${SLOT} -eq 0 ]] && ROOT="${D}" mysql_lib_symlinks
}
mysql_pkg_preinst() {
@@ -532,7 +536,9 @@ mysql_pkg_preinst() {
mysql_pkg_postinst() {
mysql_init_vars
- mysql_lib_symlinks
+ # slotted, manage lib symlinks on the real file-system
+ # to cope with other version installed
+ [[ ${SLOT} -ne 0 ]] && mysql_lib_symlinks
# mind at FEATURES=collision-protect before to remove this
[ -d "${ROOT}/var/log/mysql" ] \