From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RR9kE-00054A-DR for garchives@archives.gentoo.org; Thu, 17 Nov 2011 21:43:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADBAA21C061; Thu, 17 Nov 2011 21:43:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 75E4021C061 for ; Thu, 17 Nov 2011 21:43:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEB9464C5D for ; Thu, 17 Nov 2011 21:43:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3895C80042 for ; Thu, 17 Nov 2011 21:43:33 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <6299b59049946059e63fa02c74edb2547a063b48.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6299b59049946059e63fa02c74edb2547a063b48 Date: Thu, 17 Nov 2011 21:43:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 14b7909c-b917-4254-83db-d4b379005b0f X-Archives-Hash: 77494408feba851d30fddfb5c1e596cd commit: 6299b59049946059e63fa02c74edb2547a063b48 Author: Robin H. Johnson orbis-terrarum net> AuthorDate: Thu Nov 17 21:43:28 2011 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Nov 17 21:43:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D6299b590 Port in fix by dev-zero from tree for bug #388673, so that emerge --confi= g mysql works properly again. --- eclass/mysql-v2.eclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index d556230..de9a79e 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -640,7 +640,7 @@ mysql-v2_pkg_config() { help_tables=3D"${TMPDIR}/fill_help_tables.sql" =20 pushd "${TMPDIR}" &>/dev/null - "${EROOT}/usr/bin/mysql_install_db --basedir=3D/usr" >"${TMPDIR}"/mysql= _install_db.log 2>&1 + "${EROOT}/usr/bin/mysql_install_db" --basedir=3D/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/mysq= ld.err AND ${TMPDIR}/mysql_install_db.log"