diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-04-06 09:56:23 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-04-06 09:56:23 -0700 |
| commit | 61b4b9854495e0b6c134a2087c86141f85af1add (patch) | |
| tree | d9c6711ce68dbf65eccacc523f3a8cd843a87b14 /pym/portage/data.py | |
| parent | also check quoting on the Prefix variables added in EAPI=3, thanks jlec for t... (diff) | |
| download | portage-61b4b9854495e0b6c134a2087c86141f85af1add.tar.gz portage-61b4b9854495e0b6c134a2087c86141f85af1add.tar.bz2 portage-61b4b9854495e0b6c134a2087c86141f85af1add.zip | |
Remove PORTAGE_USERNAME and PORTAGE_GROUPNAME support for now since antarus
says he wants it to work via make.conf, requiring redesign.
Diffstat (limited to 'pym/portage/data.py')
| -rw-r--r-- | pym/portage/data.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/portage/data.py b/pym/portage/data.py index ff23dbe00..893663195 100644 --- a/pym/portage/data.py +++ b/pym/portage/data.py @@ -3,7 +3,6 @@ # Distributed under the terms of the GNU General Public License v2 import os, sys, pwd, grp, platform -from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME import portage portage.proxy.lazyimport.lazyimport(globals(), @@ -77,8 +76,8 @@ except KeyError: #Discover the uid and gid of the portage user/group try: - portage_uid = pwd.getpwnam(PORTAGE_USERNAME)[2] - portage_gid = grp.getgrnam(PORTAGE_GROUPNAME)[2] + portage_uid = pwd.getpwnam('portage')[2] + portage_gid = grp.getgrnam('portage')[2] if secpass < 1 and portage_gid in os.getgroups(): secpass=1 except KeyError: @@ -106,7 +105,7 @@ else: from subprocess import getstatusoutput except ImportError: from commands import getstatusoutput - mystatus, myoutput = getstatusoutput("id -G %s" % PORTAGE_USERNAME) + mystatus, myoutput = getstatusoutput("id -G %s" % 'portage') if mystatus == os.EX_OK: for x in myoutput.split(): try: |