From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.43) id 1DuM9C-0002Zp-Fe for garchives@archives.gentoo.org; Mon, 18 Jul 2005 03:18:26 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j6I3H8Yu000605; Mon, 18 Jul 2005 03:17:08 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [134.68.220.30]) by robin.gentoo.org (8.13.4/8.13.4) with ESMTP id j6I3H7hm005858 for ; Mon, 18 Jul 2005 03:17:07 GMT Received: from p061204002040.ppp.prin.ne.jp ([61.204.2.40] helo=opteron246.suzuki-stubbs.home) by smtp.gentoo.org with esmtpa (Exim 4.43) id 1DuM8Z-0005QV-NG for gentoo-portage-dev@lists.gentoo.org; Mon, 18 Jul 2005 03:17:51 +0000 Received: by opteron246.suzuki-stubbs.home (Postfix, from userid 1000) id D1249100A8E; Mon, 18 Jul 2005 12:17:59 +0900 (JST) From: Jason Stubbs To: gentoo-portage-dev@lists.gentoo.org Subject: [gentoo-portage-dev] PATCH: Alter ccache directory permissions to match what is tested for (#99101) Date: Mon, 18 Jul 2005 12:17:57 +0900 User-Agent: KMail/1.8.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart7244380.EjlAWWIl4e"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200507181217.59677.jstubbs@gentoo.org> X-Archives-Salt: b4792dbb-4993-4184-aedb-24769fafa786 X-Archives-Hash: fcfbdbbf20a11da01d7c5ebc550e5564 --nextPart7244380.EjlAWWIl4e Content-Type: multipart/mixed; boundary="Boundary-01=_m9x2ClcQBARcUgE" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_m9x2ClcQBARcUgE Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline http://bugs.gentoo.org/show_bug.cgi?id=3D99101 Author: Jason Stubbs It is possible that the ccache dir does not have the g+x permission=20 bit. The test that checks if ccache permissions are appropriate=20 becomes true if that permission bit is not set, but the permission=20 adjustment block does not adjust the permission bit appropriately.=20 This causes the permission adjusting block to be run every time. =2D-=20 Jason Stubbs --Boundary-01=_m9x2ClcQBARcUgE Content-Type: text/x-diff; charset="us-ascii"; name="99101_ccache_perms_adjust.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="99101_ccache_perms_adjust.patch" 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"] --Boundary-01=_m9x2ClcQBARcUgE-- --nextPart7244380.EjlAWWIl4e Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQBC2x9nxvWNPsk/ZP4RAsxuAKC7FFkUkipW0qtsF5QIedTI+phJhQCgh8D5 00pxEK899eW43IBOD/tGDL8= =KwgJ -----END PGP SIGNATURE----- --nextPart7244380.EjlAWWIl4e-- -- gentoo-portage-dev@gentoo.org mailing list