From: Zac Medico <zmedico@gmail.com>
Date: Wed, 24 Mar 2010 03:03:51 +0000 (-0700)
Subject: Add support for PORTAGE_USERNAME and PORTAGE_GROUPNAME environment
X-Git-Tag: v2.2_rc68~698
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd003fd10f92eed2a7f932d3be85935c321d1097;p=portage.git

Add support for PORTAGE_USERNAME and PORTAGE_GROUPNAME environment
variables. Thanks to Alec Warner <antarus@g.o> for submitting the
initial PORTAGE_USERNAME patch from chromiumos-overlay.
---

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 95ea76cb9..b017bcf75 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -66,6 +66,9 @@ BASH_BINARY              = "/bin/bash"
 MOVE_BINARY              = "/bin/mv"
 PRELINK_BINARY           = "/usr/sbin/prelink"
 
+PORTAGE_GROUPNAME        = os.environ.get("PORTAGE_GROUPNAME", 'portage')
+PORTAGE_USERNAME         = os.environ.get("PORTAGE_USERNAME", 'portage')
+
 INVALID_ENV_FILE         = "/etc/spork/is/not/valid/profile.env"
 REPO_NAME_FILE           = "repo_name"
 REPO_NAME_LOC            = "profiles" + "/" + REPO_NAME_FILE
diff --git a/pym/portage/data.py b/pym/portage/data.py
index c82a8b625..6322a6ab9 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -4,6 +4,7 @@
 # $Id$
 
 import os, sys, pwd, grp, platform
+from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
@@ -77,8 +78,8 @@ except KeyError:
 
 #Discover the uid and gid of the portage user/group
 try:
-	portage_uid=pwd.getpwnam("portage")[2]
-	portage_gid=grp.getgrnam("portage")[2]
+	portage_uid = pwd.getpwnam(PORTAGE_USERNAME)[2]
+	portage_gid = grp.getgrnam(PORTAGE_GROUPNAME)[2]
 	if secpass < 1 and portage_gid in os.getgroups():
 		secpass=1
 except KeyError: