From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LYnIe-0006hx-6l for garchives@archives.gentoo.org; Sun, 15 Feb 2009 20:09:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D02ECE0491; Sun, 15 Feb 2009 20:09:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B1A33E0491 for ; Sun, 15 Feb 2009 20:09:10 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 1EAE4B4E57 for ; Sun, 15 Feb 2009 20:09:10 +0000 (UTC) Received: from grobian by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LYnIb-0000Gf-SD for gentoo-commits@lists.gentoo.org; Sun, 15 Feb 2009 20:09:09 +0000 From: "Fabian Groffen (grobian)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, grobian@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: eutils.eclass X-VCS-Directories: eclass X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen Content-Type: text/plain; charset=utf8 Message-Id: Sender: Fabian Groffen Date: Sun, 15 Feb 2009 20:09:09 +0000 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: 7a581dac-987a-427b-b068-fd679ebc06f2 X-Archives-Hash: e3a68af3a2fd37a469ac4c396959e400 grobian 09/02/15 20:09:09 Modified: eutils.eclass Log: Apply patch by Armando Di Cianno to add support for OSX 10.5+ in egeten= t, bug #257945 Revision Changes Path 1.310 eclass/eutils.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.ecla= ss?rev=3D1.310&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.ecla= ss?rev=3D1.310&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.ecla= ss?r1=3D1.309&r2=3D1.310 Index: eutils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- eutils.eclass 7 Feb 2009 10:57:38 -0000 1.309 +++ eutils.eclass 15 Feb 2009 20:09:09 -0000 1.310 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.309 2009/02/= 07 10:57:38 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.310 2009/02/= 15 20:09:09 grobian Exp $ =20 # @ECLASS: eutils.eclass # @MAINTAINER: @@ -389,10 +389,26 @@ # usata@gentoo.org (OS X) # Aaron Walker (FreeBSD) # @DESCRIPTION: -# Small wrapper for getent (Linux), nidump (Mac OS X), +# Small wrapper for getent (Linux), +# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5), # and pw (FreeBSD) used in enewuser()/enewgroup() egetent() { case ${CHOST} in + *-darwin9) + local mytype=3D$1 + [[ "passwd" =3D=3D $mytype ]] && mytype=3D"Users" + [[ "group" =3D=3D $mytype ]] && mytype=3D"Groups" + case "$2" in + *[!0-9]*) # Non numeric + dscl . -read /$mytype/$2 2>/dev/null |grep RecordName + ;; + *) # Numeric + local mykey=3D"UniqueID" + [[ $mytype =3D=3D "Groups" ]] && mykey=3D"PrimaryGroupID" + dscl . -search /$mytype $mykey $2 2>/dev/null + ;; + esac + ;; *-darwin*) case "$2" in *[!0-9]*) # Non numeric