From: Naohiro Aota <naota@gentoo.org>
Date: Fri, 4 Nov 2011 13:08:23 +0000 (+0000)
Subject: Change possible mis-used ${action} to ${db}
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b1d8f2b42b2436a0399a6a3a0662b53a709cb5a4;p=gentoo.git

Change possible mis-used ${action} to ${db}
---

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index e732a74791a3..4829e4456653 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1 2011/11/03 23:24:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.2 2011/11/04 13:08:23 naota Exp $
+
+  04 Nov 2011; Naohiro Aota <naota@gentoo.org> mysql.eclass, user.eclass:
+  Change possible mis-used ${action} to ${db}
 
   03 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog:
   Created ChangeLog
diff --git a/eclass/user.eclass b/eclass/user.eclass
index 553161139749..575bb685faa2 100644
--- a/eclass/user.eclass
+++ b/eclass/user.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/user.eclass,v 1.9 2011/11/03 15:29:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.10 2011/11/04 13:08:23 naota Exp $
 
 # @ECLASS: user.eclass
 # @MAINTAINER:
@@ -78,10 +78,10 @@ egetent() {
 		# lookup by uid/gid
 		local opts
 		if [[ ${key} == [[:digit:]]* ]] ; then
-			[[ ${action} == "user" ]] && opts="-u" || opts="-g"
+			[[ ${db} == "user" ]] && opts="-u" || opts="-g"
 		fi
 
-		pw show ${action} ${opts} "${key}" -q
+		pw show ${db} ${opts} "${key}" -q
 		;;
 	*-netbsd*|*-openbsd*)
 		grep "${key}:\*:" /etc/${db}