diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2005-09-12 14:58:15 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2005-09-12 14:58:15 +0000 |
| commit | 423d37227cc82cbb4bc8bd584c5d69ba7d51472e (patch) | |
| tree | 54df04a7067998ecf9ee80b30df3a49039169b2f /dev-db/mysql/mysql-4.1.14.ebuild | |
| parent | Fix eclean to be compatible with portage 2.0.52 Bug# 105382. Fix broken stat ... (diff) | |
| download | gentoo-2-423d37227cc82cbb4bc8bd584c5d69ba7d51472e.tar.gz gentoo-2-423d37227cc82cbb4bc8bd584c5d69ba7d51472e.tar.bz2 gentoo-2-423d37227cc82cbb4bc8bd584c5d69ba7d51472e.zip | |
Fix for bug #105668 shame on me ; Other ebuilds ported to the use of mysql-extras instead of $FILESDIR
(Portage version: 2.0.52-r1)
Diffstat (limited to 'dev-db/mysql/mysql-4.1.14.ebuild')
| -rw-r--r-- | dev-db/mysql/mysql-4.1.14.ebuild | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild index bcd6c6b4ee23..72560c17c047 100644 --- a/dev-db/mysql/mysql-4.1.14.ebuild +++ b/dev-db/mysql/mysql-4.1.14.ebuild @@ -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/dev-db/mysql/mysql-4.1.14.ebuild,v 1.3 2005/09/11 16:30:54 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.4 2005/09/12 14:58:15 vivo Exp $ inherit eutils flag-o-matic versionator @@ -69,10 +69,13 @@ mysql_upgrade_warning() { mysql_get_datadir() { DATADIR="" if [ -f '/etc/mysql/my.cnf' ] ; then - #DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'` #DATADIR=`/usr/sbin/mysqld --help |grep '^datadir' | awk '{print $2}'` #DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'` DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1` + if [ -z "${DATADIR}" ]; then + DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'` + einfo "Using default DATADIR" + fi fi if [ -z "${DATADIR}" ]; then DATADIR="/var/lib/mysql/" @@ -479,7 +482,7 @@ pkg_config() { einfo "Check the password" read -rsp " >" pwd2 ; echo - if [[ pwd1 != pwd2 ]] ; then + if [[ "x$pwd1" != "x$pwd2" ]] ; then die "Passwords are not the same" fi |