diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-03 22:34:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-03 22:34:43 +0000 |
| commit | e4a25e1ef4876458344ceb96d29f315c6fdee9d4 (patch) | |
| tree | 2d049e1a8aee33360eecbbc40ddd8beddde20801 /pym/portage.py | |
| parent | e214c72b7b5a3d102a17bffea9229816d2d28714 (diff) | |
| download | portage-e4a25e1ef4876458344ceb96d29f315c6fdee9d4.tar.gz portage-e4a25e1ef4876458344ceb96d29f315c6fdee9d4.tar.bz2 portage-e4a25e1ef4876458344ceb96d29f315c6fdee9d4.zip | |
Make droppriv for the depend phase conditional on userpriv in FEATURES. (trunk r7553)
svn path=/main/branches/2.1.2/; revision=7554
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index f655a29db..49e2205ba 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3700,12 +3700,13 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, # get possible slot information from the deps file if mydo == "depend": writemsg("!!! DEBUG: dbkey: %s\n" % str(dbkey), 2) + droppriv = "userpriv" in mysettings.features if isinstance(dbkey, dict): mysettings["dbkey"] = "" pr, pw = os.pipe() fd_pipes = {0:0, 1:1, 2:2, 9:pw} mypids = spawn(EBUILD_SH_BINARY + " depend", mysettings, - fd_pipes=fd_pipes, returnpid=True, droppriv=1) + fd_pipes=fd_pipes, returnpid=True, droppriv=droppriv) os.close(pw) # belongs exclusively to the child process now maxbytes = 1024 mybytes = [] @@ -3733,7 +3734,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, mysettings["dbkey"] = \ os.path.join(mysettings.depcachedir, "aux_db_key_temp") - return spawn(EBUILD_SH_BINARY + " depend", mysettings, droppriv=1) + return spawn(EBUILD_SH_BINARY + " depend", mysettings, + droppriv=droppriv) # Validate dependency metadata here to ensure that ebuilds with invalid # data are never installed (even via the ebuild command). |