[patch] patch for portage.py

bugs.26701.patch (text/plain), 1.17 KB, created by Masatomo Nakano (RETIRED) on 2003-08-17 14:30:13 UTC

--- portage.py.org	2003-08-17 21:19:08.000000000 +0100
+++ portage.py	2003-08-17 22:17:41.000000000 +0100
@@ -1210,7 +1210,7 @@
 				sys.stderr.write(">>> Downloading "+str(loc)+"\n")
 				myfetch=string.replace(locfetch,"${URI}",loc)
 				myfetch=string.replace(myfetch,"${FILE}",myfile)
-				myret=spawn(myfetch,free=1)
+				myret=spawn(myfetch,free=1,droppriv=("userpriv" in features))
 				if mydigests!=None and mydigests.has_key(myfile):
 					try:
 						mystat=os.stat(settings["DISTDIR"]+"/"+myfile)
@@ -1659,6 +1659,19 @@
 		except:
 			pass
 
+		try:
+			if ("userpriv" in features):
+				mystat=os.stat(settings["DISTDIR"])
+				if (mystat[ST_GID]!=portage_gid) or ((mystat[ST_MODE]&02070)!=02070):
+					print "*** Adjusting DISTDIR permissions for portage user..."
+					os.chown(settings["DISTDIR"],portage_uid,portage_gid)
+					os.chmod(settings["DISTDIR"],02770)
+					if mystat[ST_GID]!=portage_gid:
+						spawn("chown -R "+str(portage_uid)+":"+str(portage_gid)+" "+settings["DISTDIR"], free=1)
+						spawn("chmod -R g+rw "+settings["DISTDIR"], free=1)
+		except:
+			pass
+
 		settings["WORKDIR"]=settings["BUILDDIR"]+"/work"
 		settings["D"]=settings["BUILDDIR"]+"/image/"