From: Tiziano Müller Date: Thu, 17 Nov 2011 16:04:02 +0000 (+0000) Subject: Fixed misplaced quotes in mysql-v2 eclass causing 'emerge --config mysql' to fail... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=531161211e5b9104c2f4a3e3fdba1f37d6410a3f;p=gentoo.git Fixed misplaced quotes in mysql-v2 eclass causing 'emerge --config mysql' to fail (bug #388673). --- diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c16b99e0d5de..3d50a29c332b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.14 2011/11/15 09:02:15 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.15 2011/11/17 16:04:02 dev-zero Exp $ + + 17 Nov 2011; Tiziano Müller mysql-v2.eclass: + Fixed misplaced quotes in mysql-v2 eclass causing 'emerge --config mysql' to + fail (bug #388673). 15 Nov 2011; Vlastimil Babka java-vm-2.eclass: Drop the repetitive elogs about revdep rebuild control files for binary diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 5b41d1275be8..5f82221bf93f 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.10 2011/11/17 16:04:02 dev-zero Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -640,7 +640,7 @@ mysql-v2_pkg_config() { help_tables="${TMPDIR}/fill_help_tables.sql" pushd "${TMPDIR}" &>/dev/null - "${ROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1 + "${ROOT}/usr/bin/mysql_install_db" --basedir=/usr >"${TMPDIR}"/mysql_install_db.log 2>&1 if [ $? -ne 0 ]; then grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"