[gentoo-portage-dev] PATCH: Alter ccache directory permissions to match what is tested for (#99101)

[gentoo-portage-dev] PATCH: Alter ccache directory permissions to match what is tested for (#99101)

[Jason Stubbs]

[-- Attachment #1.1: Type: text/plain, Size: 433 bytes --]

http://bugs.gentoo.org/show_bug.cgi?id=99101

Author: Jason Stubbs

It is possible that the ccache dir does not have the g+x permission 
bit. The test that checks if ccache permissions are appropriate 
becomes true if that permission bit is not set, but the permission 
adjustment block does not adjust the permission bit appropriately. 
This causes the permission adjusting block to be run every time.

-- 
Jason Stubbs

[-- Attachment #1.2: 99101_ccache_perms_adjust.patch --]
[-- Type: text/x-diff, Size: 1500 bytes --]

diff -uNr portage-stable/pym/portage.py portage-fixed/pym/portage.py
--- portage-stable/pym/portage.py	2005-07-18 11:04:29.357511848 +0900
+++ portage-fixed/pym/portage.py	2005-07-18 11:09:34.943055784 +0900
@@ -2529,14 +2529,14 @@
 						spawn("chgrp -R "+str(portage_gid)+" "+mysettings["CCACHE_DIR"], mysettings, free=1)
 						spawn("chown "+str(portage_uid)+":"+str(portage_gid)+" "+mysettings["CCACHE_DIR"], mysettings, free=1)
 						spawn("chmod -R ug+rw "+mysettings["CCACHE_DIR"], mysettings, free=1)
-						spawn("find "+mysettings["CCACHE_DIR"]+" -type d -exec chmod g+s \{\} \;", mysettings, free=1)
+						spawn("find "+mysettings["CCACHE_DIR"]+" -type d -exec chmod g+xs \{\} \;", mysettings, free=1)
 				else:
 					if mystat[stat.ST_UID] != 0 or ((mystat[stat.ST_MODE]&02070)!=02070):
 						writemsg("* Adjusting permissions on ccache in %s\n" % mysettings["CCACHE_DIR"])
 						spawn("chgrp -R "+str(portage_gid)+" "+mysettings["CCACHE_DIR"], mysettings, free=1)
 						spawn("chown 0:"+str(portage_gid)+" "+mysettings["CCACHE_DIR"], mysettings, free=1)
 						spawn("chmod -R ug+rw "+mysettings["CCACHE_DIR"], mysettings, free=1)
-						spawn("find "+mysettings["CCACHE_DIR"]+" -type d -exec chmod g+s \{\} \;", mysettings, free=1)
+						spawn("find "+mysettings["CCACHE_DIR"]+" -type d -exec chmod g+xs \{\} \;", mysettings, free=1)
 		except OSError, e:
 			print "!!! File system problem. (ReadOnly? Out of space?)"
 			print "!!! Perhaps: rm -Rf",mysettings["BUILD_PREFIX"]

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]