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 1Pux22-0000Mz-S2 for garchives@archives.gentoo.org; Thu, 03 Mar 2011 01:08:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 346F5E04ED; Thu, 3 Mar 2011 01:08:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 026B8E04ED for ; Thu, 3 Mar 2011 01:08:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 607781B405F for ; Thu, 3 Mar 2011 01:08:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 473468006A for ; Thu, 3 Mar 2011 01:08:29 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: ec95b5c4a46af091a74281536472b1985260da66 Date: Thu, 3 Mar 2011 01:08:29 +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: X-Archives-Hash: d90d3c6d2a37a80f848602acb50c4bcc commit: ec95b5c4a46af091a74281536472b1985260da66 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Thu Mar 3 01:05:32 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Thu Mar 3 01:05:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3Dec95b5c4 Don't declare MYSQL_ROOT_PASSWORD as a local var and improve the message = about how to specify the root password by mentioning the use of /root/.my= .cnf. Fixes bug 356885. --- eclass/mysql.eclass | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 2800c4c..0589238 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1315,7 +1315,6 @@ mysql_pkg_config() { =20 local pwd1=3D"a" local pwd2=3D"b" - local MYSQL_ROOT_PASSWORD=3D'' local maxtry=3D15 =20 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then @@ -1335,8 +1334,8 @@ mysql_pkg_config() { =20 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then =20 - einfo "Please provide a password for the mysql 'root' user now," - einfo "or in the MYSQL_ROOT_PASSWORD env var." + einfo "Please provide a password for the mysql 'root' user now, in the= " + einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file." ewarn "Avoid [\"'\\_%] characters in the password" read -rsp " >" pwd1 ; echo =20