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 1RZVax-0008Cd-0z for garchives@archives.gentoo.org; Sat, 10 Dec 2011 22:40:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B1F221C0B1; Sat, 10 Dec 2011 22:40:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ED78821C0B1 for ; Sat, 10 Dec 2011 22:40:31 +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 756AB1B4008 for ; Sat, 10 Dec 2011 22:40:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DF18A80042 for ; Sat, 10 Dec 2011 22:40:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <98031d249cf328a397eac507a289743d2ce719f2.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/data.py X-VCS-Directories: pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 98031d249cf328a397eac507a289743d2ce719f2 Date: Sat, 10 Dec 2011 22:40:30 +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: 8ad2d117-bf47-482b-8d3e-e874fae6616e X-Archives-Hash: 96f473594dbc4ee04f3f61b6171c461d commit: 98031d249cf328a397eac507a289743d2ce719f2 Author: Zac Medico gentoo org> AuthorDate: Sat Dec 10 22:40:21 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 10 22:40:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D98031d24 data.py: rename var to _portage_username --- pym/portage/data.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pym/portage/data.py b/pym/portage/data.py index 7c17334..f17fd73 100644 --- a/pym/portage/data.py +++ b/pym/portage/data.py @@ -1,5 +1,5 @@ # data.py -- Calculated/Discovered Data Values -# Copyright 1998-2010 Gentoo Foundation +# Copyright 1998-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import os, pwd, grp, platform @@ -86,7 +86,7 @@ def _get_global(k): secpass =3D 2 #Discover the uid and gid of the portage user/group try: - portage_uid =3D pwd.getpwnam(_get_global('_portage_uname')).pw_uid + portage_uid =3D pwd.getpwnam(_get_global('_portage_username')).pw_uid portage_gid =3D grp.getgrnam(_get_global('_portage_grpname')).gr_gid if secpass < 1 and portage_gid in os.getgroups(): secpass =3D 1 @@ -125,7 +125,7 @@ def _get_global(k): # grp.getgrall() since it is known to trigger spurious # SIGPIPE problems with nss_ldap. mystatus, myoutput =3D \ - portage.subprocess_getstatusoutput("id -G %s" % _portage_uname) + portage.subprocess_getstatusoutput("id -G %s" % _portage_username) if mystatus =3D=3D os.EX_OK: for x in myoutput.split(): try: @@ -137,7 +137,7 @@ def _get_global(k): elif k =3D=3D '_portage_grpname': env =3D getattr(portage, 'settings', os.environ) v =3D env.get('PORTAGE_GRPNAME', 'portage') - elif k =3D=3D '_portage_uname': + elif k =3D=3D '_portage_username': env =3D getattr(portage, 'settings', os.environ) v =3D env.get('PORTAGE_USERNAME', 'portage') else: @@ -159,7 +159,7 @@ class _GlobalProxy(portage.proxy.objectproxy.ObjectPr= oxy): return _get_global(object.__getattribute__(self, '_name')) =20 for k in ('portage_gid', 'portage_uid', 'secpass', 'userpriv_groups', - '_portage_grpname', '_portage_uname'): + '_portage_grpname', '_portage_username'): globals()[k] =3D _GlobalProxy(k) del k =20 @@ -170,7 +170,7 @@ def _init(settings): instead of requiring them to be set in the calling environment. """ if '_portage_grpname' not in _initialized_globals and \ - '_portage_uname' not in _initialized_globals: + '_portage_username' not in _initialized_globals: =20 v =3D settings.get('PORTAGE_GRPNAME') if v is not None: @@ -179,5 +179,5 @@ def _init(settings): =20 v =3D settings.get('PORTAGE_USERNAME') if v is not None: - globals()['_portage_uname'] =3D v - _initialized_globals.add('_portage_uname') + globals()['_portage_username'] =3D v + _initialized_globals.add('_portage_username')