diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-19 23:04:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-19 23:04:26 +0000 |
| commit | bc419636d00e8ff7ce5acb08b5320fe41f8d29c8 (patch) | |
| tree | 7ad9444c0cbbabfd56a4d29e42128b3e3b613038 /pym/portage.py | |
| parent | df6da8be9378ad9afe7ab8a05894f6e4579737e9 (diff) | |
| download | portage-bc419636d00e8ff7ce5acb08b5320fe41f8d29c8.tar.gz portage-bc419636d00e8ff7ce5acb08b5320fe41f8d29c8.tar.bz2 portage-bc419636d00e8ff7ce5acb08b5320fe41f8d29c8.zip | |
For userpriv, call setgroups with all groups that the portage user belongs to (bug #137610).
svn path=/main/trunk/; revision=4760
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index 4d6c86a04..218677625 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -73,7 +73,7 @@ try: INCREMENTALS, EAPI, MISC_SH_BINARY from portage_data import ostype, lchown, userland, secpass, uid, wheelgid, \ - portage_uid, portage_gid + portage_uid, portage_gid, userpriv_groups from portage_manifest import Manifest import portage_util @@ -1926,7 +1926,7 @@ def spawn(mystring,mysettings,debug=0,free=0,droppriv=0,sesandbox=0,fd_pipes=Non ("userpriv" in string.split(mysettings["RESTRICT"])))) if droppriv and not uid and portage_gid and portage_uid: - keywords.update({"uid":portage_uid,"gid":portage_gid,"groups":[portage_gid],"umask":002}) + keywords.update({"uid":portage_uid,"gid":portage_gid,"groups":userpriv_groups,"umask":002}) if not free: free=((droppriv and "usersandbox" not in features) or \ @@ -2257,7 +2257,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", spawn_keywords.update({ "uid" : portage_uid, "gid" : portage_gid, - "groups" : [portage_gid], + "groups" : userpriv_groups, "umask" : 002}) try: |