/[gentoo-x86]/eclass/mysql.eclass
Gentoo

Diff of /eclass/mysql.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.173 Revision 1.174
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.173 2012/07/31 16:57:29 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.174 2012/09/10 02:07:08 ferringb Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
8# Luca Longinotti <chtekk@gentoo.org> 8# Luca Longinotti <chtekk@gentoo.org>
1302 if built_with_use ${CATEGORY}/${PN} minimal ; then 1302 if built_with_use ${CATEGORY}/${PN} minimal ; then
1303 die "Minimal builds do NOT include the MySQL server" 1303 die "Minimal builds do NOT include the MySQL server"
1304 fi 1304 fi
1305 1305
1306 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 1306 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1307 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" 1307 local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
1308 MY_DATADIR_s="${MY_DATADIR_s%%/}"
1308 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" 1309 local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
1310 old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
1309 1311
1310 if [[ -d "${old_MY_DATADIR_s}" ]]; then 1312 if [[ -d "${old_MY_DATADIR_s}" ]]; then
1311 if [[ -d "${MY_DATADIR_s}" ]]; then 1313 if [[ -d "${MY_DATADIR_s}" ]]; then
1312 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 1314 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1313 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" 1315 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"

Legend:
Removed from v.1.173  
changed lines
  Added in v.1.174

  ViewVC Help
Powered by ViewVC 1.1.20