[patch] patch for portage.py (.49-r2)

bugs.26701.patch (text/plain), 1.74 KB, created by Masatomo Nakano (RETIRED) on 2003-08-31 12:31:59 UTC

--- portage.py.org	2003-08-31 19:39:33.000000000 +0100
+++ portage.py	2003-08-31 20:01:50.000000000 +0100
@@ -1211,14 +1211,17 @@
 				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)
 						# no exception?  file exists. let digestcheck() report
 						# an appropriately for size or md5 errors
-						os.chown(settings["DISTDIR"]+"/"+myfile,os.getuid(),portage_gid)
+						if ("userpriv" in features):
+							os.chown(settings["DISTDIR"]+"/"+myfile,portage_uid,portage_gid)
+						else:
+							os.chown(settings["DISTDIR"]+"/"+myfile,os.getuid(),portage_gid)
 						os.chmod(settings["DISTDIR"]+"/"+myfile,0664)
 						if (mystat[ST_SIZE]<mydigests[myfile]["size"]):
 							# Fetch failed... Try the next one... Kill 404 files though.
@@ -1596,6 +1599,20 @@
 			print myso[1]
 		return myso[0]
 
+
+	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
+
 	# Build directory creation isn't required for any of these.
 	if mydo not in ["fetch","digest","manifest"]:
 		try: