From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 3 Aug 2007 22:33:30 +0000 (-0000)
Subject: Make droppriv for the depend phase conditional on userpriv in FEATURES.
X-Git-Tag: v2.2_pre1~906
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=da03b7847c5c46d2748908d9814dab66807863c8;p=portage.git

Make droppriv for the depend phase conditional on userpriv in FEATURES.

svn path=/main/trunk/; revision=7553
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4d9f05e56..7f18803c1 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3749,12 +3749,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 = []
@@ -3782,7 +3783,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).